From 786ff98f6decce315e8cdf160b806237b00cc4ed Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Thu, 14 May 2009 21:38:17 +0000
Subject: [PATCH] Remove all messages from the groups module that would be
 output when it is NOT enabled.

---
 .../Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs          | 8 ++------
 .../Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs             | 7 ++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
index da7aa6b9a3..24d539f1d4 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
         {
             IConfig groupsConfig = config.Configs["Groups"];
 
-            m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging");
-
             if (groupsConfig == null)
             {
                 // Do not run this module by default.
-                m_log.Info("[GROUPS-MESSAGING]: No config found in OpenSim.ini -- not enabling XmlRpcGroupsMessaging");
                 return;
             }
             else
             {
                 if (!groupsConfig.GetBoolean("Enabled", false))
                 {
-                    m_log.Info("[GROUPS-MESSAGING]: Groups disabled in configuration");
                     return;
                 }
 
                 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
                 {
-                    m_log.Info("[GROUPS-MESSAGING]: Config Groups Module not set to XmlRpcGroups");
                     m_groupMessagingEnabled = false;
 
                     return;
@@ -100,10 +95,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                 if (!m_groupMessagingEnabled)
                 {
-                    m_log.Info("[GROUPS-MESSAGING]: XmlRpcGroups Messaging disabled.");
                     return;
                 }
 
+                m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging");
+
                 m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true);
             }
 
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
index 88f80387e1..40481a8f2b 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
@@ -102,12 +102,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             IConfig groupsConfig = config.Configs["Groups"];
 
-            m_log.Info("[GROUPS]: Initializing XmlRpcGroups");
-
             if (groupsConfig == null)
             {
                 // Do not run this module by default.
-                m_log.Info("[GROUPS]: No config found in OpenSim.ini -- not enabling XmlRpcGroups");
                 return;
             }
             else
@@ -115,18 +112,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_groupsEnabled = groupsConfig.GetBoolean("Enabled", false);
                 if (!m_groupsEnabled)
                 {
-                    m_log.Info("[GROUPS]: Groups disabled in configuration");
                     return;
                 }
 
                 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
                 {
-                    m_log.Info("[GROUPS]: Config Groups Module not set to XmlRpcGroups");
                     m_groupsEnabled = false;
 
                     return;
                 }
 
+                m_log.Info("[GROUPS]: Initializing XmlRpcGroups");
+
                 string ServiceURL = groupsConfig.GetString("XmlRpcServiceURL", m_defaultXmlRpcServiceURL);
                 bool DisableKeepAlive = groupsConfig.GetBoolean("XmlRpcDisableKeepAlive", false);