diff options
Diffstat (limited to 'OpenSim/Framework/Util.cs')
-rw-r--r-- | OpenSim/Framework/Util.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 1b3a4c3..ccbe75e 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -377,9 +377,11 @@ namespace OpenSim.Framework | |||
377 | return Utils.UIntsToLong(X, Y); | 377 | return Utils.UIntsToLong(X, Y); |
378 | } | 378 | } |
379 | 379 | ||
380 | public static ulong RegionLocToHandle(uint X, uint Y) | 380 | public static ulong RegionGridLocToHandle(uint X, uint Y) |
381 | { | 381 | { |
382 | return Utils.UIntsToLong(Util.RegionToWorldLoc(X), Util.RegionToWorldLoc(Y)); | 382 | ulong handle = X << 40; // shift to higher half and mult by 256) |
383 | handle |= (Y << 8); // mult by 256) | ||
384 | return handle; | ||
383 | } | 385 | } |
384 | 386 | ||
385 | public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y) | 387 | public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y) |
@@ -1303,7 +1305,7 @@ namespace OpenSim.Framework | |||
1303 | } | 1305 | } |
1304 | catch (Exception e) | 1306 | catch (Exception e) |
1305 | { | 1307 | { |
1306 | m_log.WarnFormat("[UTILS]: Exception copying configuration file {0} to {1}: {2}", exampleConfigFile, configFile, e.Message); | 1308 | m_log.WarnFormat("[UTILS]: Exception copying configuration file {0} to {1}: {2}", configFile, exampleConfigFile, e.Message); |
1307 | return false; | 1309 | return false; |
1308 | } | 1310 | } |
1309 | } | 1311 | } |