Index: OpenSim/Framework/General/Types/UUID.cs
===================================================================
--- OpenSim/Framework/General/Types/UUID.cs	(revision 2040)
+++ OpenSim/Framework/General/Types/UUID.cs	(working copy)
@@ -91,12 +91,12 @@
 
         public void Combine(UUID other)
         {
-            llUUID.Combine(other.GetLLUUID());
+            LLUUID.Combine(llUUID, other.GetLLUUID());
         }
 
         public void Combine(LLUUID other)
         {
-            llUUID.Combine(other);
+            LLUUID.Combine(llUUID, other);
         }
 
         public override bool Equals(Object other)
Index: OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
===================================================================
--- OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs	(revision 2040)
+++ OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs	(working copy)
@@ -353,7 +353,7 @@
                         // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionID).ToStringHyphenated());
                         if (OnAssetUploadRequest != null)
                         {
-                            OnAssetUploadRequest(this, request.AssetBlock.TransactionID.Combine(this.SecureSessionID), request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.AssetData, request.AssetBlock.StoreLocal);
+                            OnAssetUploadRequest(this, LLUUID.Combine(request.AssetBlock.TransactionID, this.SecureSessionID), request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.AssetData, request.AssetBlock.StoreLocal);
                         }
                         break;
                     case PacketType.RequestXfer:
@@ -418,7 +418,7 @@
                             {
                                 if (update.InventoryData[i].TransactionID != LLUUID.Zero)
                                 {
-                                    OnUpdateInventoryItem(this, update.InventoryData[i].TransactionID, update.InventoryData[i].TransactionID.Combine(this.SecureSessionID), update.InventoryData[i].ItemID);
+                                    OnUpdateInventoryItem(this, update.InventoryData[i].TransactionID, LLUUID.Combine(update.InventoryData[i].TransactionID, this.SecureSessionID), update.InventoryData[i].ItemID);
                                 }
                             }
                         }
Index: OpenSim/Region/Environment/Modules/ChatModule.cs
===================================================================
--- OpenSim/Region/Environment/Modules/ChatModule.cs	(revision 2040)
+++ OpenSim/Region/Environment/Modules/ChatModule.cs	(working copy)
@@ -162,7 +162,7 @@
                                                      avatar = m_scene.GetScenePresence(presence.ControllingClient.AgentId);
                                                      if (avatar != null)
                                                      {
-                                                         dis = (int) avatar.AbsolutePosition.GetDistanceTo(fromPos);
+                                                         dis = (int) LLVector3.Dist(avatar.AbsolutePosition, fromPos);
                                                      }
 
                                                      switch (type)
Index: OpenSim/Region/Environment/Scenes/ScenePresence.cs
===================================================================
--- OpenSim/Region/Environment/Scenes/ScenePresence.cs	(revision 2040)
+++ OpenSim/Region/Environment/Scenes/ScenePresence.cs	(working copy)
@@ -564,7 +564,7 @@
                 }
 
                     /// check for physics-related movement
-                else if (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02)
+                else if (LLVector3.Dist(lastPhysPos, AbsolutePosition) > 0.02)
                 {
                     SendTerseUpdateToAllClients();
                     m_updateCount = 0;
@@ -751,7 +751,7 @@
 
         protected void CheckForSignificantMovement()
         {
-            if (Helpers.VecDist(AbsolutePosition, posLastSignificantMove) > 2.0)
+            if (LLVector3.Dist(AbsolutePosition, posLastSignificantMove) > 2.0)
             {
                 posLastSignificantMove = AbsolutePosition;
                 if (OnSignificantClientMovement != null)
Index: OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
===================================================================
--- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs	(revision 2040)
+++ OpenSim/Region/Physics/OdePlugin/OdePlugin.cs	(working copy)
@@ -30,7 +30,6 @@
 using System.Collections.Generic;
 
 using libsecondlife;
-using libsecondlife.Utilities;
 
 using Axiom.Math;
 using Ode.NET;