Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new

libOMV.

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index f72797f..f0ad1d5 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -185,7 +185,7 @@ namespace OpenSim.Framework
 
         public static ulong UIntsToLong(uint X, uint Y)
         {
-            return Helpers.UIntsToLong(X, Y);
+            return Utils.UIntsToLong(X, Y);
         }
 
         public static T Clamp<T>(T x, T min, T max)
@@ -783,9 +783,9 @@ namespace OpenSim.Framework
         public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y)
         {
             byte[] bytes = parcelID.GetBytes();
-            regionHandle = Helpers.BytesToUInt64(bytes);
-            x = Helpers.BytesToUInt(bytes, 8);
-            y = Helpers.BytesToUInt(bytes, 12);
+            regionHandle = Utils.BytesToUInt64(bytes);
+            x = Utils.BytesToUInt(bytes, 8);
+            y = Utils.BytesToUInt(bytes, 12);
         }
 
         public static void FakeParcelIDToGlobalPosition(UUID parcelID, out uint x, out uint y)
@@ -794,7 +794,7 @@ namespace OpenSim.Framework
             uint rx, ry;
 
             ParseFakeParcelID(parcelID, out regionHandle, out x, out y);
-            Helpers.LongToUInts(regionHandle, out rx, out ry);
+            Utils.LongToUInts(regionHandle, out rx, out ry);
 
             x += rx;
             y += ry;