aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-15 15:38:29 -0700
committerJohn Hurliman2010-03-15 15:38:29 -0700
commit84459d2bc22618ef082d717c8d9d33c6527e5e39 (patch)
tree73a603825d44f61adb93400872f509866060fdaf /OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
parent* UuidGatherer now tracks asset types for assets it discovers. The asset type... (diff)
downloadopensim-SC-84459d2bc22618ef082d717c8d9d33c6527e5e39.zip
opensim-SC-84459d2bc22618ef082d717c8d9d33c6527e5e39.tar.gz
opensim-SC-84459d2bc22618ef082d717c8d9d33c6527e5e39.tar.bz2
opensim-SC-84459d2bc22618ef082d717c8d9d33c6527e5e39.tar.xz
Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs6
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..166df41 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -34,12 +34,12 @@ using Nini.Config;
34 34
35public static class Simian 35public static class Simian
36{ 36{
37 public static bool IsSimianEnabled(IConfigSource config, string moduleName) 37 public static bool IsSimianEnabled(IConfigSource config, string moduleName, string connectorName)
38 { 38 {
39 if (config.Configs["Modules"] != null) 39 if (config.Configs["Modules"] != null)
40 { 40 {
41 string module = config.Configs["Modules"].GetString("AuthenticationServices"); 41 string module = config.Configs["Modules"].GetString(moduleName);
42 return !String.IsNullOrEmpty(module) && module.Contains("Simian"); 42 return !String.IsNullOrEmpty(module) && module == connectorName;
43 } 43 }
44 44
45 return false; 45 return false;