aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-01-05 15:10:22 +0000
committerTedd Hansen2008-01-05 15:10:22 +0000
commit53793db182207b384bedab6094f879e9a8ad92d6 (patch)
treec574ec8b5eb54907afbac1365a9c371103444035
parent* Applying jhurliman's LLSD login enablement patch. (diff)
downloadopensim-SC_OLD-53793db182207b384bedab6094f879e9a8ad92d6.zip
opensim-SC_OLD-53793db182207b384bedab6094f879e9a8ad92d6.tar.gz
opensim-SC_OLD-53793db182207b384bedab6094f879e9a8ad92d6.tar.bz2
opensim-SC_OLD-53793db182207b384bedab6094f879e9a8ad92d6.tar.xz
Added errorhandler+tip that grid server might not be running on grid registration failure on opensim startup.
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs16
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 8d52eeb..2b324f8 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -113,10 +113,18 @@ namespace OpenSim.Region.Communications.OGS1
113 SendParams.Add(GridParams); 113 SendParams.Add(GridParams);
114 114
115 // Send Request 115 // Send Request
116 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); 116 XmlRpcRequest GridReq;
117 XmlRpcResponse GridResp = GridReq.Send(serversInfo.GridURL, 10000); 117 XmlRpcResponse GridResp;
118 Hashtable GridRespData = (Hashtable) GridResp.Value; 118 try
119 119 {
120 GridReq = new XmlRpcRequest("simulator_login", SendParams);
121 GridResp = GridReq.Send(serversInfo.GridURL, 10000);
122 } catch (Exception ex)
123 {
124 MainLog.Instance.Error("Unable to connect to grid (Grid server not running?): " + ex.ToString());
125 return null;
126 }
127 Hashtable GridRespData = (Hashtable)GridResp.Value;
120 Hashtable griddatahash = GridRespData; 128 Hashtable griddatahash = GridRespData;
121 129
122 // Process Response 130 // Process Response