ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
libOMV.
This commit is contained in:
Melanie Thielker
2008-11-19 06:25:34 +00:00
parent 3234472d62
commit f518ca7feb
63 changed files with 447 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/Util.cs
View File

@@ -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;