Merge branch 'master' into careminster-presence-refactor

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index c3de98e..7d97aaa 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -34,12 +34,12 @@ using Nini.Config;
 
 public static class Simian
 {
-    public static bool IsSimianEnabled(IConfigSource config, string moduleName)
+    public static bool IsSimianEnabled(IConfigSource config, string moduleName, string connectorName)
     {
         if (config.Configs["Modules"] != null)
         {
-            string module = config.Configs["Modules"].GetString("AuthenticationServices");
-            return !String.IsNullOrEmpty(module) && module.Contains("Simian");
+            string module = config.Configs["Modules"].GetString(moduleName);
+            return !String.IsNullOrEmpty(module) && module.EndsWith(connectorName);
         }
 
         return false;