From d05d065d859c8877cb910cf5748e32e1560086a6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 Nov 2011 00:29:52 +0000
Subject: Improve some grid region log messages to express regions at
 co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000)

---
 OpenSim/Data/IRegionData.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'OpenSim/Data/IRegionData.cs')

diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 46dc4fb..4761a7a 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -37,10 +37,30 @@ namespace OpenSim.Data
         public UUID RegionID;
         public UUID ScopeID;
         public string RegionName;
+
+        /// <summary>
+        /// The position in meters of this region.
+        /// </summary>
         public int posX;
+
+        /// <summary>
+        /// The position in meters of this region.
+        /// </summary>
         public int posY;
+        
         public int sizeX;
         public int sizeY;
+
+        /// <summary>
+        /// Return the x-coordinate of this region.  We currently assume that every region is the same size.
+        /// </summary>
+        public int coordX { get { return (sizeX != 0) ? posX / sizeX : -1; } }
+
+        /// <summary>
+        /// Return the y-coordinate of this region.  We currently assume that every region is the same size.
+        /// </summary>
+        public int coordY { get { return (sizeY != 0) ? posY / sizeY : -1; } }
+
         public Dictionary<string, object> Data;
     }
 
-- 
cgit v1.1


From b89534ad0a8a0be24f27634b9a198e2b53f129e0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 Nov 2011 00:34:13 +0000
Subject: Remove mono compiler warnings.  Fix problem with co-ordinate given in
 deregister region message

---
 OpenSim/Data/IRegionData.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Data/IRegionData.cs')

diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 4761a7a..0068daa 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -47,19 +47,19 @@ namespace OpenSim.Data
         /// The position in meters of this region.
         /// </summary>
         public int posY;
-        
+
         public int sizeX;
         public int sizeY;
 
         /// <summary>
-        /// Return the x-coordinate of this region.  We currently assume that every region is the same size.
+        /// Return the x-coordinate of this region.
         /// </summary>
-        public int coordX { get { return (sizeX != 0) ? posX / sizeX : -1; } }
+        public int coordX { get { return (sizeX != 0) ? posX / (int)Constants.RegionSize : -1; } }
 
         /// <summary>
-        /// Return the y-coordinate of this region.  We currently assume that every region is the same size.
+        /// Return the y-coordinate of this region.
         /// </summary>
-        public int coordY { get { return (sizeY != 0) ? posY / sizeY : -1; } }
+        public int coordY { get { return (sizeY != 0) ? posY / (int)Constants.RegionSize : -1; } }
 
         public Dictionary<string, object> Data;
     }
-- 
cgit v1.1


From 10a23a823edb261af2c0b7895ce0898ea6918ef1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 Nov 2011 01:16:07 +0000
Subject: Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent
 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string
 messages

These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
---
 OpenSim/Data/IRegionData.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/IRegionData.cs')

diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 0068daa..546b5e8 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -54,12 +54,12 @@ namespace OpenSim.Data
         /// <summary>
         /// Return the x-coordinate of this region.
         /// </summary>
-        public int coordX { get { return (sizeX != 0) ? posX / (int)Constants.RegionSize : -1; } }
+        public int coordX { get { return posX / (int)Constants.RegionSize; } }
 
         /// <summary>
         /// Return the y-coordinate of this region.
         /// </summary>
-        public int coordY { get { return (sizeY != 0) ? posY / (int)Constants.RegionSize : -1; } }
+        public int coordY { get { return posY / (int)Constants.RegionSize; } }
 
         public Dictionary<string, object> Data;
     }
-- 
cgit v1.1