aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
diff options
context:
space:
mode:
authorMelanie2010-03-18 20:09:04 +0000
committerMelanie2010-03-18 20:09:04 +0000
commit4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch)
tree9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentFlesh out the new permission method (diff)
downloadopensim-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 'OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs2
1 files changed, 1 insertions, 1 deletions
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)