OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.6.5-rc1
Melanie Thielker 2009-04-20 13:39:41 +00:00
parent b98f93212b
commit 489758f68a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
View File

@ -107,6 +107,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
{ {
m_log.Info("[GROUPS]: Config Groups Module not set to XmlRpcGroups"); m_log.Info("[GROUPS]: Config Groups Module not set to XmlRpcGroups");
m_GroupsEnabled = false;
return; return;
} }
@ -129,11 +130,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
if (!m_GroupsEnabled) if (!m_GroupsEnabled)
return; return;
if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
m_MsgTransferModule = scene.RequestModuleInterface<IMessageTransferModule>(); m_MsgTransferModule = scene.RequestModuleInterface<IMessageTransferModule>();
@ -157,6 +157,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
if (!m_GroupsEnabled)
return;
if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
m_SceneList.Remove(scene); m_SceneList.Remove(scene);
@ -164,6 +167,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
public void Close() public void Close()
{ {
if (!m_GroupsEnabled)
return;
m_log.Debug("[GROUPS]: Shutting down XmlRpcGroups module."); m_log.Debug("[GROUPS]: Shutting down XmlRpcGroups module.");
} }