diff options
author | Melanie Thielker | 2009-04-20 13:59:18 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-04-20 13:59:18 +0000 |
commit | 334021732003c2ff7ce69db84f7719c2586dff59 (patch) | |
tree | 6b177b4fd28dccf46b99b5a85ccd14f848c6de6c /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | |
parent | Prevent a null ref if a notecard is not found (diff) | |
download | opensim-SC_OLD-334021732003c2ff7ce69db84f7719c2586dff59.zip opensim-SC_OLD-334021732003c2ff7ce69db84f7719c2586dff59.tar.gz opensim-SC_OLD-334021732003c2ff7ce69db84f7719c2586dff59.tar.bz2 opensim-SC_OLD-334021732003c2ff7ce69db84f7719c2586dff59.tar.xz |
Also make GroupsMessaging quit trying to run and reduce it's debug
spamming somewhat
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs index d14d135..5990fa6 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | |||
@@ -90,6 +90,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
90 | if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") | 90 | if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") |
91 | { | 91 | { |
92 | m_log.Info("[GROUPS-MESSAGING]: Config Groups Module not set to XmlRpcGroups"); | 92 | m_log.Info("[GROUPS-MESSAGING]: Config Groups Module not set to XmlRpcGroups"); |
93 | m_GroupMessagingEnabled = false; | ||
93 | 94 | ||
94 | return; | 95 | return; |
95 | } | 96 | } |
@@ -115,11 +116,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
115 | } | 116 | } |
116 | public void RegionLoaded(Scene scene) | 117 | public void RegionLoaded(Scene scene) |
117 | { | 118 | { |
118 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
119 | |||
120 | if (!m_GroupMessagingEnabled) | 119 | if (!m_GroupMessagingEnabled) |
121 | return; | 120 | return; |
122 | 121 | ||
122 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
123 | |||
123 | 124 | ||
124 | m_GroupsModule = scene.RequestModuleInterface<IGroupsModule>(); | 125 | m_GroupsModule = scene.RequestModuleInterface<IGroupsModule>(); |
125 | 126 | ||
@@ -154,6 +155,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
154 | 155 | ||
155 | public void RemoveRegion(Scene scene) | 156 | public void RemoveRegion(Scene scene) |
156 | { | 157 | { |
158 | if (!m_GroupMessagingEnabled) | ||
159 | return; | ||
160 | |||
157 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 161 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
158 | 162 | ||
159 | m_SceneList.Remove(scene); | 163 | m_SceneList.Remove(scene); |
@@ -162,6 +166,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
162 | 166 | ||
163 | public void Close() | 167 | public void Close() |
164 | { | 168 | { |
169 | if (!m_GroupMessagingEnabled) | ||
170 | return; | ||
171 | |||
165 | m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module."); | 172 | m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module."); |
166 | 173 | ||
167 | 174 | ||