aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-10-05 11:14:46 -0700
committerDiva Canto2009-10-05 11:14:46 -0700
commit5f18a088a83c9997e1fe026241de2c0db1a961b8 (patch)
treec51cfe80fec509c4744e5b4ee4af6ac25981b2e6
parentChanged the lock object, to see if this helps at all. Also switched the order... (diff)
downloadopensim-SC-5f18a088a83c9997e1fe026241de2c0db1a961b8.zip
opensim-SC-5f18a088a83c9997e1fe026241de2c0db1a961b8.tar.gz
opensim-SC-5f18a088a83c9997e1fe026241de2c0db1a961b8.tar.bz2
opensim-SC-5f18a088a83c9997e1fe026241de2c0db1a961b8.tar.xz
More error catching/outputting.
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs18
1 files changed, 14 insertions, 4 deletions
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
137 } 137 }
138 138
139 Dictionary<string, object> rinfoData = new Dictionary<string, object>(); 139 Dictionary<string, object> rinfoData = new Dictionary<string, object>();
140 foreach (KeyValuePair<string, string> kvp in request) 140 GridRegion rinfo = null;
141 rinfoData[kvp.Key] = kvp.Value; 141 try
142 GridRegion rinfo = new GridRegion(rinfoData); 142 {
143 foreach (KeyValuePair<string, string> kvp in request)
144 rinfoData[kvp.Key] = kvp.Value;
145 rinfo = new GridRegion(rinfoData);
146 }
147 catch (Exception e)
148 {
149 m_log.DebugFormat("[GRID HANDLER]: exception unpacking region data: {0}", e);
150 }
143 151
144 bool result = m_GridService.RegisterRegion(scopeID, rinfo); 152 bool result = false;
153 if (rinfo != null)
154 m_GridService.RegisterRegion(scopeID, rinfo);
145 155
146 if (result) 156 if (result)
147 return SuccessResult(); 157 return SuccessResult();