aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-08-13 00:16:50 +0100
committerUbitUmarov2016-08-13 00:16:50 +0100
commitb64f25e631a0ec5681ddff050dc9bead5e0a7c8b (patch)
treee187c7cab1999c9391b5dcf839ada113f58ec2db
parent avoid automatic packet spliting in GroupMembersReply (diff)
downloadopensim-SC_OLD-b64f25e631a0ec5681ddff050dc9bead5e0a7c8b.zip
opensim-SC_OLD-b64f25e631a0ec5681ddff050dc9bead5e0a7c8b.tar.gz
opensim-SC_OLD-b64f25e631a0ec5681ddff050dc9bead5e0a7c8b.tar.bz2
opensim-SC_OLD-b64f25e631a0ec5681ddff050dc9bead5e0a7c8b.tar.xz
add a missing cast to ulong in RegionGridLocToHandle (mantis: 7994)
-rw-r--r--OpenSim/Framework/Util.cs3
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 }