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/SimianAssetServiceConnector.cs      | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

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

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 3f00534..7cb075e 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -85,24 +85,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            IConfig gridConfig = source.Configs["AssetService"];
-            if (gridConfig == null)
+            if (Simian.IsSimianEnabled(source, "AssetServices"))
             {
-                m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
-                throw new Exception("Asset connector init error");
-            }
+                IConfig gridConfig = source.Configs["AssetService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
+                    throw new Exception("Asset connector init error");
+                }
 
-            string serviceUrl = gridConfig.GetString("AssetServerURI");
-            if (String.IsNullOrEmpty(serviceUrl))
-            {
-                m_log.Info("[ASSET CONNECTOR]: No AssetServerURI in section AssetService, skipping SimianAssetServiceConnector");
-                return;
-            }
+                string serviceUrl = gridConfig.GetString("AssetServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[ASSET CONNECTOR]: No AssetServerURI in section AssetService");
+                    throw new Exception("Asset connector init error");
+                }
 
-            if (!serviceUrl.EndsWith("/"))
-                serviceUrl = serviceUrl + '/';
+                if (!serviceUrl.EndsWith("/"))
+                    serviceUrl = serviceUrl + '/';
 
-            m_serverUrl = serviceUrl;
+                m_serverUrl = serviceUrl;
+            }
         }
 
         #region IAssetService
-- 
cgit v1.1