diff options
author | Melanie Thielker | 2009-05-14 21:38:17 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-14 21:38:17 +0000 |
commit | 786ff98f6decce315e8cdf160b806237b00cc4ed (patch) | |
tree | ee590659cd8731feeecf682c6f2fe9c6de670fd8 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | |
parent | Remove a misleading event that was only used internally (diff) | |
download | opensim-SC-786ff98f6decce315e8cdf160b806237b00cc4ed.zip opensim-SC-786ff98f6decce315e8cdf160b806237b00cc4ed.tar.gz opensim-SC-786ff98f6decce315e8cdf160b806237b00cc4ed.tar.bz2 opensim-SC-786ff98f6decce315e8cdf160b806237b00cc4ed.tar.xz |
Remove all messages from the groups module that would be output when it is
NOT enabled.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs index da7aa6b..24d539f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | |||
@@ -72,25 +72,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
72 | { | 72 | { |
73 | IConfig groupsConfig = config.Configs["Groups"]; | 73 | IConfig groupsConfig = config.Configs["Groups"]; |
74 | 74 | ||
75 | m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging"); | ||
76 | |||
77 | if (groupsConfig == null) | 75 | if (groupsConfig == null) |
78 | { | 76 | { |
79 | // Do not run this module by default. | 77 | // Do not run this module by default. |
80 | m_log.Info("[GROUPS-MESSAGING]: No config found in OpenSim.ini -- not enabling XmlRpcGroupsMessaging"); | ||
81 | return; | 78 | return; |
82 | } | 79 | } |
83 | else | 80 | else |
84 | { | 81 | { |
85 | if (!groupsConfig.GetBoolean("Enabled", false)) | 82 | if (!groupsConfig.GetBoolean("Enabled", false)) |
86 | { | 83 | { |
87 | m_log.Info("[GROUPS-MESSAGING]: Groups disabled in configuration"); | ||
88 | return; | 84 | return; |
89 | } | 85 | } |
90 | 86 | ||
91 | if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") | 87 | if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") |
92 | { | 88 | { |
93 | m_log.Info("[GROUPS-MESSAGING]: Config Groups Module not set to XmlRpcGroups"); | ||
94 | m_groupMessagingEnabled = false; | 89 | m_groupMessagingEnabled = false; |
95 | 90 | ||
96 | return; | 91 | return; |
@@ -100,10 +95,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
100 | 95 | ||
101 | if (!m_groupMessagingEnabled) | 96 | if (!m_groupMessagingEnabled) |
102 | { | 97 | { |
103 | m_log.Info("[GROUPS-MESSAGING]: XmlRpcGroups Messaging disabled."); | ||
104 | return; | 98 | return; |
105 | } | 99 | } |
106 | 100 | ||
101 | m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging"); | ||
102 | |||
107 | m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true); | 103 | m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true); |
108 | } | 104 | } |
109 | 105 | ||