diff options
| author | UbitUmarov | 2016-08-19 03:05:25 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-19 03:05:25 +0100 |
| commit | 7ba3fb7b5d9c883b7a99d19f893ff6d43689b629 (patch) | |
| tree | 1ea4937e30520d440979ab02e92882f6f54a3e73 /OpenSim/Framework/Util.cs | |
| parent | fix entity update flags update (diff) | |
| parent | catch some NULL refs (diff) | |
| download | opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.zip opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.gz opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.bz2 opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.xz | |
merge issue
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 5250d30..96b91ff 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -382,7 +382,8 @@ namespace OpenSim.Framework | |||
| 382 | 382 | ||
| 383 | public static ulong RegionGridLocToHandle(uint X, uint Y) | 383 | public static ulong RegionGridLocToHandle(uint X, uint Y) |
| 384 | { | 384 | { |
| 385 | ulong handle = X << 40; // shift to higher half and mult by 256) | 385 | ulong handle = X; |
| 386 | handle <<= 40; // shift to higher half and mult by 256) | ||
| 386 | handle |= (Y << 8); // mult by 256) | 387 | handle |= (Y << 8); // mult by 256) |
| 387 | return handle; | 388 | return handle; |
| 388 | } | 389 | } |