aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-14 21:38:17 +0000
committerMelanie Thielker2009-05-14 21:38:17 +0000
commit786ff98f6decce315e8cdf160b806237b00cc4ed (patch)
treeee590659cd8731feeecf682c6f2fe9c6de670fd8 /OpenSim
parentRemove a misleading event that was only used internally (diff)
downloadopensim-SC_OLD-786ff98f6decce315e8cdf160b806237b00cc4ed.zip
opensim-SC_OLD-786ff98f6decce315e8cdf160b806237b00cc4ed.tar.gz
opensim-SC_OLD-786ff98f6decce315e8cdf160b806237b00cc4ed.tar.bz2
opensim-SC_OLD-786ff98f6decce315e8cdf160b806237b00cc4ed.tar.xz
Remove all messages from the groups module that would be output when it is
NOT enabled.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs8
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs7
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 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
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
index 88f8038..40481a8 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
102 { 102 {
103 IConfig groupsConfig = config.Configs["Groups"]; 103 IConfig groupsConfig = config.Configs["Groups"];
104 104
105 m_log.Info("[GROUPS]: Initializing XmlRpcGroups");
106
107 if (groupsConfig == null) 105 if (groupsConfig == null)
108 { 106 {
109 // Do not run this module by default. 107 // Do not run this module by default.
110 m_log.Info("[GROUPS]: No config found in OpenSim.ini -- not enabling XmlRpcGroups");
111 return; 108 return;
112 } 109 }
113 else 110 else
@@ -115,18 +112,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
115 m_groupsEnabled = groupsConfig.GetBoolean("Enabled", false); 112 m_groupsEnabled = groupsConfig.GetBoolean("Enabled", false);
116 if (!m_groupsEnabled) 113 if (!m_groupsEnabled)
117 { 114 {
118 m_log.Info("[GROUPS]: Groups disabled in configuration");
119 return; 115 return;
120 } 116 }
121 117
122 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") 118 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
123 { 119 {
124 m_log.Info("[GROUPS]: Config Groups Module not set to XmlRpcGroups");
125 m_groupsEnabled = false; 120 m_groupsEnabled = false;
126 121
127 return; 122 return;
128 } 123 }
129 124
125 m_log.Info("[GROUPS]: Initializing XmlRpcGroups");
126
130 string ServiceURL = groupsConfig.GetString("XmlRpcServiceURL", m_defaultXmlRpcServiceURL); 127 string ServiceURL = groupsConfig.GetString("XmlRpcServiceURL", m_defaultXmlRpcServiceURL);
131 bool DisableKeepAlive = groupsConfig.GetBoolean("XmlRpcDisableKeepAlive", false); 128 bool DisableKeepAlive = groupsConfig.GetBoolean("XmlRpcDisableKeepAlive", false);
132 129