diff options
| author | Melanie | 2013-08-11 17:31:25 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-11 17:31:25 +0100 |
| commit | ad1b2902f247a998f23e0d677ee50b10ab306396 (patch) | |
| tree | 34dadb17811f2fba2f41595ce040e8a9352acc18 /OpenSim/Framework/Util.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Stats treaking. Update ToOSDMap for Stat and PercentageStat to return (diff) | |
| download | opensim-SC_OLD-ad1b2902f247a998f23e0d677ee50b10ab306396.zip opensim-SC_OLD-ad1b2902f247a998f23e0d677ee50b10ab306396.tar.gz opensim-SC_OLD-ad1b2902f247a998f23e0d677ee50b10ab306396.tar.bz2 opensim-SC_OLD-ad1b2902f247a998f23e0d677ee50b10ab306396.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 19d40db..7398b37 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1259,7 +1259,7 @@ namespace OpenSim.Framework | |||
| 1259 | byte[] bytes = | 1259 | byte[] bytes = |
| 1260 | { | 1260 | { |
| 1261 | (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24), | 1261 | (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24), |
| 1262 | (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle << 56), | 1262 | (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle >> 56), |
| 1263 | (byte)x, (byte)(x >> 8), 0, 0, | 1263 | (byte)x, (byte)(x >> 8), 0, 0, |
| 1264 | (byte)y, (byte)(y >> 8), 0, 0 }; | 1264 | (byte)y, (byte)(y >> 8), 0, 0 }; |
| 1265 | return new UUID(bytes, 0); | 1265 | return new UUID(bytes, 0); |
| @@ -1270,7 +1270,7 @@ namespace OpenSim.Framework | |||
| 1270 | byte[] bytes = | 1270 | byte[] bytes = |
| 1271 | { | 1271 | { |
| 1272 | (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24), | 1272 | (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24), |
| 1273 | (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle << 56), | 1273 | (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle >> 56), |
| 1274 | (byte)x, (byte)(x >> 8), (byte)z, (byte)(z >> 8), | 1274 | (byte)x, (byte)(x >> 8), (byte)z, (byte)(z >> 8), |
| 1275 | (byte)y, (byte)(y >> 8), 0, 0 }; | 1275 | (byte)y, (byte)(y >> 8), 0, 0 }; |
| 1276 | return new UUID(bytes, 0); | 1276 | return new UUID(bytes, 0); |