aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorTedd Hansen2008-01-05 15:48:02 +0000
committerTedd Hansen2008-01-05 15:48:02 +0000
commit966f639ad6c83828d8e60ef9103ad61c360f9c3b (patch)
tree020ff9c0666d8e8980c920afd77e34660fc121f3 /OpenSim/Region/Communications
parentAdded errorhandler+tip that grid server might not be running on grid registra... (diff)
downloadopensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.zip
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.gz
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.bz2
opensim-SC_OLD-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.xz
Changes to ScriptServer to (hopefully) make it compile on both .Net and Mono.
Some debug info for startup added to find bugs. ++
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 2b324f8..653139d 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -121,8 +121,8 @@ namespace OpenSim.Region.Communications.OGS1
121 GridResp = GridReq.Send(serversInfo.GridURL, 10000); 121 GridResp = GridReq.Send(serversInfo.GridURL, 10000);
122 } catch (Exception ex) 122 } catch (Exception ex)
123 { 123 {
124 MainLog.Instance.Error("Unable to connect to grid (Grid server not running?): " + ex.ToString()); 124 MainLog.Instance.Error("Unable to connect to grid. Grid server not running?");
125 return null; 125 throw(ex);
126 } 126 }
127 Hashtable GridRespData = (Hashtable)GridResp.Value; 127 Hashtable GridRespData = (Hashtable)GridResp.Value;
128 Hashtable griddatahash = GridRespData; 128 Hashtable griddatahash = GridRespData;