diff options
author | Melanie | 2010-09-05 19:06:50 +0100 |
---|---|---|
committer | Melanie | 2010-09-05 19:06:50 +0100 |
commit | 4243701d22dd86aa7ac61459a6bd9129635dab43 (patch) | |
tree | 5b2e2ed24d2ffbc980ef27d6c5ad2dfc015141a9 /OpenSim/Services/Connectors | |
parent | Fix up presence connector in SimianGrid (diff) | |
download | opensim-SC-4243701d22dd86aa7ac61459a6bd9129635dab43.zip opensim-SC-4243701d22dd86aa7ac61459a6bd9129635dab43.tar.gz opensim-SC-4243701d22dd86aa7ac61459a6bd9129635dab43.tar.bz2 opensim-SC-4243701d22dd86aa7ac61459a6bd9129635dab43.tar.xz |
Make Simian profiles respect the module chosen in [Profile]
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index a817d7c..0ef4974 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
@@ -67,6 +67,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
67 | MethodBase.GetCurrentMethod().DeclaringType); | 67 | MethodBase.GetCurrentMethod().DeclaringType); |
68 | 68 | ||
69 | private string m_serverUrl = String.Empty; | 69 | private string m_serverUrl = String.Empty; |
70 | private bool m_Enabled = false; | ||
70 | 71 | ||
71 | #region INonSharedRegionModule | 72 | #region INonSharedRegionModule |
72 | 73 | ||
@@ -76,8 +77,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
76 | 77 | ||
77 | public SimianProfiles() { } | 78 | public SimianProfiles() { } |
78 | public string Name { get { return "SimianProfiles"; } } | 79 | public string Name { get { return "SimianProfiles"; } } |
79 | public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { CheckEstateManager(scene); scene.EventManager.OnClientConnect += ClientConnectHandler; } } | 80 | public void AddRegion(Scene scene) { if (m_Enabled) { CheckEstateManager(scene); scene.EventManager.OnClientConnect += ClientConnectHandler; } } |
80 | public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.EventManager.OnClientConnect -= ClientConnectHandler; } } | 81 | public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.EventManager.OnClientConnect -= ClientConnectHandler; } } |
81 | 82 | ||
82 | #endregion INonSharedRegionModule | 83 | #endregion INonSharedRegionModule |
83 | 84 | ||
@@ -88,6 +89,13 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
88 | 89 | ||
89 | public void Initialise(IConfigSource source) | 90 | public void Initialise(IConfigSource source) |
90 | { | 91 | { |
92 | IConfig profileConfig = source.Configs["Profile"]; | ||
93 | if (profileConfig == null) | ||
94 | return; | ||
95 | |||
96 | if (profileConfig.GetString("Module", String.Empty) != Name) | ||
97 | return; | ||
98 | |||
91 | IConfig gridConfig = source.Configs["UserAccountService"]; | 99 | IConfig gridConfig = source.Configs["UserAccountService"]; |
92 | if (gridConfig != null) | 100 | if (gridConfig != null) |
93 | { | 101 | { |