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

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2016-12-25 05:51:08 +00:00
parent 86cc02f33e 293b65ac82
commit 1b95ada105
8 changed files with 156 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/UserProfiles.cs
View File

@@ -135,6 +135,7 @@ namespace OpenSim.Framework
public string born;
public byte[] membershipType;
public uint flags;
public HashSet<IClientAPI> ClientsWaitingProps;
}
}

6
OpenSim/Framework/Util.cs
View File

@@ -1725,12 +1725,16 @@ namespace OpenSim.Framework
return new UUID(bytes, 0);
}
public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y)
public static bool ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y)
{
byte[] bytes = parcelID.GetBytes();
regionHandle = Utils.BytesToUInt64(bytes);
x = Utils.BytesToUInt(bytes, 8) & 0xffff;
y = Utils.BytesToUInt(bytes, 12) & 0xffff;
// validation may fail, just reducing the odds of using a real UUID as encoded parcel
return ( bytes[0] == 0 && bytes[4] == 0 && // handler x,y multiples of 256
bytes[9] < 64 && bytes[13] < 64 && // positions < 16km
bytes[14] == 0 && bytes[15] == 0);
}
public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y, out uint z)