From 87b313792821cb842fd54b568302b6877c4e53f8 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sat, 3 May 2008 20:00:35 +0000
Subject: * Cleaned up code in Terrain, Tree and Map modules. * Fixed a bug
 with Terragen loader where it would do bad things on a non 256x256 sized
 terrain. Now loads the array correctly. * Moved MapImageModule.cs to
 Modules/World/WorldMap * Changed Location.RegionHandle to use
 Helpers.GetUlong instead of doing it ourselves.

---
 OpenSim/Framework/Location.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index a3d504c..6bc0755 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -1,4 +1,5 @@
 using System;
+using libsecondlife;
 
 namespace OpenSim.Framework
 {
@@ -22,7 +23,7 @@ namespace OpenSim.Framework
 
         public ulong RegionHandle
         {
-            get { return ((ulong) m_x << 32 & (ulong) m_y); }
+            get { return Helpers.UIntsToLong((uint) m_x, (uint) m_y); }
         }
 
         public int X
-- 
cgit v1.1