Merge branch 'master' into careminster-presence-refactor

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
index b3ecc7e..89eb72d 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -76,7 +76,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            if (Simian.IsSimianEnabled(source, "FriendsServices"))
+            bool isSimianEnabled = false;
+
+            if (source.Configs["Friends"] != null)
+            {
+                string module = source.Configs["Friends"].GetString("Connector");
+                isSimianEnabled = !String.IsNullOrEmpty(module) && module.EndsWith(this.Name);
+            }
+
+            if (isSimianEnabled)
             {
                 IConfig assetConfig = source.Configs["FriendsService"];
                 if (assetConfig == null)