aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDalien Talbot2007-11-18 05:28:28 +0000
committerDalien Talbot2007-11-18 05:28:28 +0000
commitbaa4e82107065c3bdf7954581362c3e631637b09 (patch)
treec9333b5b3f0a9a44cf88ff20ba54a6012a31b055
parentAdded handler for MapNameRequest - OnMapNameRequest (diff)
downloadopensim-SC_OLD-baa4e82107065c3bdf7954581362c3e631637b09.zip
opensim-SC_OLD-baa4e82107065c3bdf7954581362c3e631637b09.tar.gz
opensim-SC_OLD-baa4e82107065c3bdf7954581362c3e631637b09.tar.bz2
opensim-SC_OLD-baa4e82107065c3bdf7954581362c3e631637b09.tar.xz
Prevent the region crash in gridmode on bringing up the map
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs18
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index c29dd41..d355f92 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -266,10 +266,18 @@ namespace OpenSim.Region.Communications.OGS1
266 param["ymax"] = maxY; 266 param["ymax"] = maxY;
267 IList parameters = new ArrayList(); 267 IList parameters = new ArrayList();
268 parameters.Add(param); 268 parameters.Add(param);
269 XmlRpcRequest req = new XmlRpcRequest("map_block", parameters); 269 try
270 XmlRpcResponse resp = req.Send(serversInfo.GridURL, 10000); 270 {
271 Hashtable respData = (Hashtable) resp.Value; 271 XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
272 return respData; 272 XmlRpcResponse resp = req.Send(serversInfo.GridURL, 10000);
273 Hashtable respData = (Hashtable) resp.Value;
274 return respData;
275 }
276 catch (Exception e)
277 {
278 MainLog.Instance.Error("MapBlockQuery XMLRPC failure: " + e.ToString());
279 return new Hashtable();
280 }
273 } 281 }
274 282
275 /// <summary> 283 /// <summary>
@@ -534,4 +542,4 @@ namespace OpenSim.Region.Communications.OGS1
534 542
535 #endregion 543 #endregion
536 } 544 }
537} \ No newline at end of file 545}