aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.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/SimianPresenceServiceConnector.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 '')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
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)