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/SimianFriendsServiceConnector.cs    | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

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

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
index abb98a3..b3ecc7e 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -76,21 +76,24 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            IConfig assetConfig = source.Configs["FriendsService"];
-            if (assetConfig == null)
+            if (Simian.IsSimianEnabled(source, "FriendsServices"))
             {
-                m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini");
-                throw new Exception("Friends connector init error");
-            }
+                IConfig assetConfig = source.Configs["FriendsService"];
+                if (assetConfig == null)
+                {
+                    m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini");
+                    throw new Exception("Friends connector init error");
+                }
 
-            string serviceURI = assetConfig.GetString("FriendsServerURI");
-            if (String.IsNullOrEmpty(serviceURI))
-            {
-                m_log.Info("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService, skipping SimianFriendsServiceConnector");
-                return;
-            }
+                string serviceURI = assetConfig.GetString("FriendsServerURI");
+                if (String.IsNullOrEmpty(serviceURI))
+                {
+                    m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService");
+                    throw new Exception("Friends connector init error");
+                }
 
-            m_serverUrl = serviceURI;
+                m_serverUrl = serviceURI;
+            }
         }
 
         #region IFriendsService
-- 
cgit v1.1