aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-12 14:28:31 -0800
committerJohn Hurliman2010-03-12 14:28:31 -0800
commit3036aba875187923b4e4d8481d46334e53393107 (patch)
tree4aa2b5ba3687873e0be69cee84a0652c9f2dd136 /OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
parentFixing the previous patch to work correctly with standalone mode (diff)
downloadopensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.zip
opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.gz
opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.bz2
opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.xz
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs27
1 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index ef943ec..eebdf14 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -80,21 +80,24 @@ namespace OpenSim.Services.Connectors.SimianGrid
80 80
81 public void Initialise(IConfigSource source) 81 public void Initialise(IConfigSource source)
82 { 82 {
83 IConfig gridConfig = source.Configs["GridService"]; 83 if (Simian.IsSimianEnabled(source, "GridServices"))
84 if (gridConfig == null)
85 { 84 {
86 m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini"); 85 IConfig gridConfig = source.Configs["GridService"];
87 throw new Exception("Grid connector init error"); 86 if (gridConfig == null)
88 } 87 {
88 m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
89 throw new Exception("Grid connector init error");
90 }
89 91
90 string serviceUrl = gridConfig.GetString("GridServerURI"); 92 string serviceUrl = gridConfig.GetString("GridServerURI");
91 if (String.IsNullOrEmpty(serviceUrl)) 93 if (String.IsNullOrEmpty(serviceUrl))
92 { 94 {
93 m_log.Info("[GRID CONNECTOR]: No Server URI named in section GridService, skipping SimianGridServiceConnector"); 95 m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService");
94 return; 96 throw new Exception("Grid connector init error");
95 } 97 }
96 98
97 m_serverUrl = serviceUrl; 99 m_serverUrl = serviceUrl;
100 }
98 } 101 }
99 102
100 #region IGridService 103 #region IGridService