diff options
author | Melanie | 2010-03-18 20:09:04 +0000 |
---|---|---|
committer | Melanie | 2010-03-18 20:09:04 +0000 |
commit | 4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch) | |
tree | 9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Services/Connectors/SimianGrid | |
parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
parent | Flesh out the new permission method (diff) | |
download | opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2 opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
10 files changed, 20 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 1c22a72..c5fbc9e 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
85 | 85 | ||
86 | public void Initialise(IConfigSource source) | 86 | public void Initialise(IConfigSource source) |
87 | { | 87 | { |
88 | if (Simian.IsSimianEnabled(source, "AssetServices")) | 88 | if (Simian.IsSimianEnabled(source, "AssetServices", this.Name)) |
89 | { | 89 | { |
90 | IConfig gridConfig = source.Configs["AssetService"]; | 90 | IConfig gridConfig = source.Configs["AssetService"]; |
91 | if (gridConfig == null) | 91 | if (gridConfig == null) |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 6317b87..cc53d6c 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
73 | 73 | ||
74 | public void Initialise(IConfigSource source) | 74 | public void Initialise(IConfigSource source) |
75 | { | 75 | { |
76 | if (Simian.IsSimianEnabled(source, "AuthenticationServices")) | 76 | if (Simian.IsSimianEnabled(source, "AuthenticationServices", this.Name)) |
77 | { | 77 | { |
78 | IConfig assetConfig = source.Configs["AuthenticationService"]; | 78 | IConfig assetConfig = source.Configs["AuthenticationService"]; |
79 | if (assetConfig == null) | 79 | if (assetConfig == null) |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs index a18cb22..00f9f36 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | |||
@@ -78,7 +78,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
78 | 78 | ||
79 | public void Initialise(IConfigSource source) | 79 | public void Initialise(IConfigSource source) |
80 | { | 80 | { |
81 | if (Simian.IsSimianEnabled(source, "AvatarServices")) | 81 | if (Simian.IsSimianEnabled(source, "AvatarServices", this.Name)) |
82 | { | 82 | { |
83 | IConfig gridConfig = source.Configs["AvatarService"]; | 83 | IConfig gridConfig = source.Configs["AvatarService"]; |
84 | if (gridConfig == null) | 84 | if (gridConfig == null) |
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 | |||
76 | 76 | ||
77 | public void Initialise(IConfigSource source) | 77 | public void Initialise(IConfigSource source) |
78 | { | 78 | { |
79 | if (Simian.IsSimianEnabled(source, "FriendsServices")) | 79 | bool isSimianEnabled = false; |
80 | |||
81 | if (source.Configs["Friends"] != null) | ||
82 | { | ||
83 | string module = source.Configs["Friends"].GetString("Connector"); | ||
84 | isSimianEnabled = !String.IsNullOrEmpty(module) && module.EndsWith(this.Name); | ||
85 | } | ||
86 | |||
87 | if (isSimianEnabled) | ||
80 | { | 88 | { |
81 | IConfig assetConfig = source.Configs["FriendsService"]; | 89 | IConfig assetConfig = source.Configs["FriendsService"]; |
82 | if (assetConfig == null) | 90 | if (assetConfig == null) |
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; | |||
34 | 34 | ||
35 | public static class Simian | 35 | public 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.EndsWith(connectorName); |
43 | } | 43 | } |
44 | 44 | ||
45 | return false; | 45 | return false; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index eebdf14..071a481 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
80 | 80 | ||
81 | public void Initialise(IConfigSource source) | 81 | public void Initialise(IConfigSource source) |
82 | { | 82 | { |
83 | if (Simian.IsSimianEnabled(source, "GridServices")) | 83 | if (Simian.IsSimianEnabled(source, "GridServices", this.Name)) |
84 | { | 84 | { |
85 | IConfig gridConfig = source.Configs["GridService"]; | 85 | IConfig gridConfig = source.Configs["GridService"]; |
86 | if (gridConfig == null) | 86 | if (gridConfig == null) |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 891782f..67f8e80 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
92 | 92 | ||
93 | public void Initialise(IConfigSource source) | 93 | public void Initialise(IConfigSource source) |
94 | { | 94 | { |
95 | if (Simian.IsSimianEnabled(source, "InventoryServices")) | 95 | if (Simian.IsSimianEnabled(source, "InventoryServices", this.Name)) |
96 | { | 96 | { |
97 | IConfig gridConfig = source.Configs["InventoryService"]; | 97 | IConfig gridConfig = source.Configs["InventoryService"]; |
98 | if (gridConfig == null) | 98 | if (gridConfig == null) |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index 1b5edf4..5e0f7c2 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
104 | 104 | ||
105 | public void Initialise(IConfigSource source) | 105 | public void Initialise(IConfigSource source) |
106 | { | 106 | { |
107 | if (Simian.IsSimianEnabled(source, "PresenceServices")) | 107 | if (Simian.IsSimianEnabled(source, "PresenceServices", this.Name)) |
108 | { | 108 | { |
109 | IConfig gridConfig = source.Configs["PresenceService"]; | 109 | IConfig gridConfig = source.Configs["PresenceService"]; |
110 | if (gridConfig == null) | 110 | if (gridConfig == null) |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index 9c226fb..0a36ae5 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
88 | 88 | ||
89 | public void Initialise(IConfigSource source) | 89 | public void Initialise(IConfigSource source) |
90 | { | 90 | { |
91 | if (Simian.IsSimianEnabled(source, "UserAccountServices")) | 91 | if (Simian.IsSimianEnabled(source, "UserAccountServices", this.Name)) |
92 | { | 92 | { |
93 | IConfig gridConfig = source.Configs["UserAccountService"]; | 93 | IConfig gridConfig = source.Configs["UserAccountService"]; |
94 | if (gridConfig == null) | 94 | if (gridConfig == null) |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index bb0ac57..491a9a2 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
77 | 77 | ||
78 | public void Initialise(IConfigSource source) | 78 | public void Initialise(IConfigSource source) |
79 | { | 79 | { |
80 | if (Simian.IsSimianEnabled(source, "UserAccountServices")) | 80 | if (Simian.IsSimianEnabled(source, "UserAccountServices", this.Name)) |
81 | { | 81 | { |
82 | IConfig assetConfig = source.Configs["UserAccountService"]; | 82 | IConfig assetConfig = source.Configs["UserAccountService"]; |
83 | if (assetConfig == null) | 83 | if (assetConfig == null) |