diff options
| author | Kevin Cozens | 2013-08-05 19:30:46 -0400 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-08 01:02:04 +0100 |
| commit | 64216b34a49377f6999f6d2cf624d3c537d3f9d5 (patch) | |
| tree | 9fd9ca9a3b2cb28b911dc84f211b84185af42cf6 /OpenSim | |
| parent | Added regression tests for the routines related to fake parcel IDs. (diff) | |
| download | opensim-SC_OLD-64216b34a49377f6999f6d2cf624d3c537d3f9d5.zip opensim-SC_OLD-64216b34a49377f6999f6d2cf624d3c537d3f9d5.tar.gz opensim-SC_OLD-64216b34a49377f6999f6d2cf624d3c537d3f9d5.tar.bz2 opensim-SC_OLD-64216b34a49377f6999f6d2cf624d3c537d3f9d5.tar.xz | |
Fixed error in BuildFakeParcelID() which was detected by regression tests.
Diffstat (limited to 'OpenSim')
| -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 6a15734..f0e5bc1 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1247,7 +1247,7 @@ namespace OpenSim.Framework | |||
| 1247 | byte[] bytes = | 1247 | byte[] bytes = |
| 1248 | { | 1248 | { |
| 1249 | (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24), | 1249 | (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24), |
| 1250 | (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle << 56), | 1250 | (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle >> 56), |
| 1251 | (byte)x, (byte)(x >> 8), 0, 0, | 1251 | (byte)x, (byte)(x >> 8), 0, 0, |
| 1252 | (byte)y, (byte)(y >> 8), 0, 0 }; | 1252 | (byte)y, (byte)(y >> 8), 0, 0 }; |
| 1253 | return new UUID(bytes, 0); | 1253 | return new UUID(bytes, 0); |
| @@ -1258,7 +1258,7 @@ namespace OpenSim.Framework | |||
| 1258 | byte[] bytes = | 1258 | byte[] bytes = |
| 1259 | { | 1259 | { |
| 1260 | (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24), | 1260 | (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24), |
| 1261 | (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle << 56), | 1261 | (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle >> 56), |
| 1262 | (byte)x, (byte)(x >> 8), (byte)z, (byte)(z >> 8), | 1262 | (byte)x, (byte)(x >> 8), (byte)z, (byte)(z >> 8), |
| 1263 | (byte)y, (byte)(y >> 8), 0, 0 }; | 1263 | (byte)y, (byte)(y >> 8), 0, 0 }; |
| 1264 | return new UUID(bytes, 0); | 1264 | return new UUID(bytes, 0); |