aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs27
1 files changed, 12 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index f7883da..0bfb8e7 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
59 59
60 private IGroupsModule m_groupsModule = null; 60 private IGroupsModule m_groupsModule = null;
61 61
62 // TODO: Move this off to the xmlrpc server 62 // TODO: Move this off to the Groups Server
63 public Dictionary<Guid, List<Guid>> m_agentsInGroupSession = new Dictionary<Guid, List<Guid>>(); 63 public Dictionary<Guid, List<Guid>> m_agentsInGroupSession = new Dictionary<Guid, List<Guid>>();
64 public Dictionary<Guid, List<Guid>> m_agentsDroppedSession = new Dictionary<Guid, List<Guid>>(); 64 public Dictionary<Guid, List<Guid>> m_agentsDroppedSession = new Dictionary<Guid, List<Guid>>();
65 65
@@ -81,31 +81,28 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
81 } 81 }
82 else 82 else
83 { 83 {
84 if (!groupsConfig.GetBoolean("Enabled", false)) 84 // if groups aren't enabled, we're not needed.
85 { 85 // if we're not specified as the connector to use, then we're not wanted
86 return; 86 if ((groupsConfig.GetBoolean("Enabled", false) == false)
87 } 87 || (groupsConfig.GetString("MessagingModule", "Default") != Name))
88
89 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
90 { 88 {
91 m_groupMessagingEnabled = false; 89 m_groupMessagingEnabled = false;
92
93 return; 90 return;
94 } 91 }
95 92
96 m_groupMessagingEnabled = groupsConfig.GetBoolean("XmlRpcMessagingEnabled", true); 93 m_groupMessagingEnabled = groupsConfig.GetBoolean("MessagingEnabled", true);
97 94
98 if (!m_groupMessagingEnabled) 95 if (!m_groupMessagingEnabled)
99 { 96 {
100 return; 97 return;
101 } 98 }
102 99
103 m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging"); 100 m_log.Info("[GROUPS-MESSAGING]: Initializing GroupsMessagingModule");
104 101
105 m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true); 102 m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
106 } 103 }
107 104
108 m_log.Info("[GROUPS-MESSAGING]: XmlRpcGroupsMessaging starting up"); 105 m_log.Info("[GROUPS-MESSAGING]: GroupsMessagingModule starting up");
109 106
110 } 107 }
111 108
@@ -125,7 +122,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
125 // No groups module, no groups messaging 122 // No groups module, no groups messaging
126 if (m_groupsModule == null) 123 if (m_groupsModule == null)
127 { 124 {
128 m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, XmlRpcGroupsMessaging is now disabled."); 125 m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, GroupsMessagingModule is now disabled.");
129 Close(); 126 Close();
130 m_groupMessagingEnabled = false; 127 m_groupMessagingEnabled = false;
131 return; 128 return;
@@ -165,7 +162,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
165 if (!m_groupMessagingEnabled) 162 if (!m_groupMessagingEnabled)
166 return; 163 return;
167 164
168 if (m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module."); 165 if (m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down GroupsMessagingModule module.");
169 166
170 foreach (Scene scene in m_sceneList) 167 foreach (Scene scene in m_sceneList)
171 { 168 {
@@ -186,7 +183,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
186 183
187 public string Name 184 public string Name
188 { 185 {
189 get { return "XmlRpcGroupsMessaging"; } 186 get { return "GroupsMessagingModule"; }
190 } 187 }
191 188
192 #endregion 189 #endregion