From 5f18a088a83c9997e1fe026241de2c0db1a961b8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Oct 2009 11:14:46 -0700
Subject: More error catching/outputting.

---
 OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index e22328d..b425d90 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -137,11 +137,21 @@ namespace OpenSim.Server.Handlers.Grid
             }
 
             Dictionary<string, object> rinfoData = new Dictionary<string, object>();
-            foreach (KeyValuePair<string, string> kvp in request)
-                rinfoData[kvp.Key] = kvp.Value;
-            GridRegion rinfo = new GridRegion(rinfoData);
+            GridRegion rinfo = null;
+            try
+            {
+                foreach (KeyValuePair<string, string> kvp in request)
+                    rinfoData[kvp.Key] = kvp.Value;
+                rinfo = new GridRegion(rinfoData);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID HANDLER]: exception unpacking region data: {0}", e);
+            }
 
-            bool result = m_GridService.RegisterRegion(scopeID, rinfo);
+            bool result = false;
+            if (rinfo != null)
+                m_GridService.RegisterRegion(scopeID, rinfo);
 
             if (result)
                 return SuccessResult();
-- 
cgit v1.1


From 05b80185b9f74979eeab0d60ae4d7de56593264c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Oct 2009 11:49:21 -0700
Subject: More debug to try to diagnose a problem with region registration.

---
 OpenSim/Server/Base/ServerUtils.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 0964caa..9d9735e 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Server.Base
 
         public static Dictionary<string, object> ParseXmlResponse(string data)
         {
-            //m_log.DebugFormat("[XXX]: received xml string: {0}", data);
+            m_log.DebugFormat("[XXX]: received xml string: {0}", data);
 
             Dictionary<string, object> ret = new Dictionary<string, object>();
 
-- 
cgit v1.1


From 9bd1353875d40806cbe76b8afca17ed5a93e9efd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Oct 2009 12:13:38 -0700
Subject: Fixed bug introduced in one of the last commits.

---
 OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index b425d90..08edcbf 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Server.Handlers.Grid
 
             bool result = false;
             if (rinfo != null)
-                m_GridService.RegisterRegion(scopeID, rinfo);
+                result = m_GridService.RegisterRegion(scopeID, rinfo);
 
             if (result)
                 return SuccessResult();
-- 
cgit v1.1