- Setting groups-messaging module to by disabled by default (groups module already is).

- Make sure it really is Close()d when the configuration isn't sane.
0.6.5-rc1
Homer Horwitz 2009-04-26 18:26:01 +00:00
parent 5c20fc1f28
commit ac3154e6b7
1 changed files with 3 additions and 3 deletions

View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// Config Options // Config Options
private bool m_groupMessagingEnabled = true; private bool m_groupMessagingEnabled = false;
private bool m_debugEnabled = true; private bool m_debugEnabled = true;
#region IRegionModuleBase Members #region IRegionModuleBase Members
@ -129,9 +129,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// No groups module, no groups messaging // No groups module, no groups messaging
if (m_groupsModule == null) if (m_groupsModule == null)
{ {
m_groupMessagingEnabled = false;
m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, XmlRpcGroupsMessaging is now disabled."); m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, XmlRpcGroupsMessaging is now disabled.");
Close(); Close();
m_groupMessagingEnabled = false;
return; return;
} }
@ -140,9 +140,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// No message transfer module, no groups messaging // No message transfer module, no groups messaging
if (m_msgTransferModule == null) if (m_msgTransferModule == null)
{ {
m_groupMessagingEnabled = false;
m_log.Error("[GROUPS-MESSAGING]: Could not get MessageTransferModule"); m_log.Error("[GROUPS-MESSAGING]: Could not get MessageTransferModule");
Close(); Close();
m_groupMessagingEnabled = false;
return; return;
} }