From 01ae916bad672722aa62ee712b7b580d6f5f4370 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 Nov 2011 00:07:34 +0000
Subject: Don't register a region twice on both official registration and
 maptile regeneration.

Maptile storage appears orthogonal to region registration
---
 OpenSim/Services/GridService/GridService.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Services/GridService')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 05cfe5f..768e4e1 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Services.GridService
                     regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
                 return "Region overlaps another region";
             }
+
             if ((region != null) && (region.RegionID == regionInfos.RegionID) && 
                 ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
             {
-- 
cgit v1.1


From 7a180781778a6369799c244ab95f5e6844b3be05 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 Nov 2011 00:10:29 +0000
Subject: improve region deregistration log message

---
 OpenSim/Services/GridService/GridService.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/GridService')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 768e4e1..82a9193 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -244,11 +244,14 @@ namespace OpenSim.Services.GridService
 
         public bool DeregisterRegion(UUID regionID)
         {
-            m_log.DebugFormat("[GRID SERVICE]: Region {0} deregistered", regionID);
             RegionData region = m_Database.Get(regionID, UUID.Zero);
             if (region == null)
                 return false;
 
+            m_log.DebugFormat(
+                "[GRID SERVICE]: Degistering region {0} ({1}) at {2}-{3}",
+                region.RegionName, region.RegionID, region.posX, region.posY);
+            
             int flags = Convert.ToInt32(region.Data["flags"]);
 
             if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Data.RegionFlags.Persistent) != 0)
-- 
cgit v1.1


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/Services/GridService/GridService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services/GridService')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 82a9193..eae10e8 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Services.GridService
             }
 
             m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}", 
-                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY);
+                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY);
 
             return String.Empty;
         }
@@ -250,8 +250,8 @@ namespace OpenSim.Services.GridService
 
             m_log.DebugFormat(
                 "[GRID SERVICE]: Degistering region {0} ({1}) at {2}-{3}",
-                region.RegionName, region.RegionID, region.posX, region.posY);
-            
+                region.RegionName, region.RegionID, region.coordX, region.coordY);
+
             int flags = Convert.ToInt32(region.Data["flags"]);
 
             if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Data.RegionFlags.Persistent) != 0)
-- 
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/Services/GridService/GridService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services/GridService')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index eae10e8..89f0716 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Services.GridService
                 return false;
 
             m_log.DebugFormat(
-                "[GRID SERVICE]: Degistering region {0} ({1}) at {2}-{3}",
+                "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}",
                 region.RegionName, region.RegionID, region.coordX, region.coordY);
 
             int flags = Convert.ToInt32(region.Data["flags"]);
@@ -296,7 +296,7 @@ namespace OpenSim.Services.GridService
                     }
                 }
 
-                m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
+//                m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
             }
             else
             {
-- 
cgit v1.1