* Thanks Plugh for pointing out that the constructor that takes a ulong regionhandle and saves it to to X,Y vars in the OpenSim.Framework.Location object was inverting the X and Y resulting in X and Y confusion. The test also used 256x256 in the uint,uint constructor so it was unable to determine if the X and Y components swapped. I don't expect much upheaval from this commit, not a lot of features were using the ulong Location object constructor. The database never stores the ulong regionhandle... the prims are loaded by region Guid. LLUDPServer used it to determine regions that it handled in a service definition where there was simply a X == X test which has the same logical result un-switched as it did switched. Again, thanks LibOMV for the regionhandle code.

1 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index 9504e03..0b88834 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -33,10 +33,10 @@ namespace OpenSim.Framework
     [Serializable]
     public class Location : ICloneable
     {
-        private readonly int m_x;
-        private readonly int m_y;
+        private readonly uint m_x;
+        private readonly uint m_y;
 
-        public Location(int x, int y)
+        public Location(uint x, uint y)
         {
             m_x = x;
             m_y = y;
@@ -44,21 +44,21 @@ namespace OpenSim.Framework
 
         public Location(ulong regionHandle)
         {
-            m_x = (int) regionHandle;
-            m_y = (int) (regionHandle >> 32);
+            m_x =  (uint)(regionHandle >> 32);
+            m_y = (uint)(regionHandle & (ulong)uint.MaxValue);
         }
 
         public ulong RegionHandle
         {
-            get { return Utils.UIntsToLong((uint)m_x, (uint)m_y); }
+            get { return Utils.UIntsToLong(m_x, m_y); }
         }
 
-        public int X
+        public uint X
         {
             get { return m_x; }
         }
 
-        public int Y
+        public uint Y
         {
             get { return m_y; }
         }