From 3036aba875187923b4e4d8481d46334e53393107 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 12 Mar 2010 14:28:31 -0800
Subject: * 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

---
 .../SimianGrid/SimianGridServiceConnector.cs       | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs')

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
 
         public void Initialise(IConfigSource source)
         {
-            IConfig gridConfig = source.Configs["GridService"];
-            if (gridConfig == null)
+            if (Simian.IsSimianEnabled(source, "GridServices"))
             {
-                m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
-                throw new Exception("Grid connector init error");
-            }
+                IConfig gridConfig = source.Configs["GridService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
+                    throw new Exception("Grid connector init error");
+                }
 
-            string serviceUrl = gridConfig.GetString("GridServerURI");
-            if (String.IsNullOrEmpty(serviceUrl))
-            {
-                m_log.Info("[GRID CONNECTOR]: No Server URI named in section GridService, skipping SimianGridServiceConnector");
-                return;
-            }
+                string serviceUrl = gridConfig.GetString("GridServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService");
+                    throw new Exception("Grid connector init error");
+                }
 
-            m_serverUrl = serviceUrl;
+                m_serverUrl = serviceUrl;
+            }
         }
 
         #region IGridService
-- 
cgit v1.1