aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-20 13:39:41 +0000
committerMelanie Thielker2009-04-20 13:39:41 +0000
commit489758f68abe15e55f73d660225e7af1851b0882 (patch)
treea85c04a179f307b56ed51e05fdbde0b7e529bd2a
parent* Prevent a vehicle crash (diff)
downloadopensim-SC_OLD-489758f68abe15e55f73d660225e7af1851b0882.zip
opensim-SC_OLD-489758f68abe15e55f73d660225e7af1851b0882.tar.gz
opensim-SC_OLD-489758f68abe15e55f73d660225e7af1851b0882.tar.bz2
opensim-SC_OLD-489758f68abe15e55f73d660225e7af1851b0882.tar.xz
Make sure that the groups module is really disabled when it's not configured.
Fixes an issue where the presence of any groups section will make XmlRpcGroups think it should hook client events.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
index 7ae3b90..6a3aa06 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
@@ -107,6 +107,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
107 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") 107 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
108 { 108 {
109 m_log.Info("[GROUPS]: Config Groups Module not set to XmlRpcGroups"); 109 m_log.Info("[GROUPS]: Config Groups Module not set to XmlRpcGroups");
110 m_GroupsEnabled = false;
110 111
111 return; 112 return;
112 } 113 }
@@ -129,11 +130,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
129 130
130 public void RegionLoaded(Scene scene) 131 public void RegionLoaded(Scene scene)
131 { 132 {
132 if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
133
134 if (!m_GroupsEnabled) 133 if (!m_GroupsEnabled)
135 return; 134 return;
136 135
136 if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
137 137
138 m_MsgTransferModule = scene.RequestModuleInterface<IMessageTransferModule>(); 138 m_MsgTransferModule = scene.RequestModuleInterface<IMessageTransferModule>();
139 139
@@ -157,6 +157,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
157 157
158 public void RemoveRegion(Scene scene) 158 public void RemoveRegion(Scene scene)
159 { 159 {
160 if (!m_GroupsEnabled)
161 return;
162
160 if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 163 if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
161 164
162 m_SceneList.Remove(scene); 165 m_SceneList.Remove(scene);
@@ -164,6 +167,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
164 167
165 public void Close() 168 public void Close()
166 { 169 {
170 if (!m_GroupsEnabled)
171 return;
167 m_log.Debug("[GROUPS]: Shutting down XmlRpcGroups module."); 172 m_log.Debug("[GROUPS]: Shutting down XmlRpcGroups module.");
168 } 173 }
169 174