aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOren Hurvitz2013-10-30 15:59:53 +0200
committerOren Hurvitz2014-03-24 18:01:47 +0100
commit1d4551e52fc02db9393c5c3653139c671a2e6c97 (patch)
tree93955ad562df14d52a6ec5d6e7fa1a629c7b29d6
parentWhen searching for users, don't add users from the local cache if they have a... (diff)
downloadopensim-SC_OLD-1d4551e52fc02db9393c5c3653139c671a2e6c97.zip
opensim-SC_OLD-1d4551e52fc02db9393c5c3653139c671a2e6c97.tar.gz
opensim-SC_OLD-1d4551e52fc02db9393c5c3653139c671a2e6c97.tar.bz2
opensim-SC_OLD-1d4551e52fc02db9393c5c3653139c671a2e6c97.tar.xz
Check settings for groups module
Resolves http://opensimulator.org/mantis/view.php?id=6937
-rw-r--r--OpenSim/Addons/Groups/GroupsMessagingModule.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index 92528a2..bbb5e05 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -110,7 +110,15 @@ namespace OpenSim.Groups
110 m_messageOnlineAgentsOnly = groupsConfig.GetBoolean("MessageOnlineUsersOnly", false); 110 m_messageOnlineAgentsOnly = groupsConfig.GetBoolean("MessageOnlineUsersOnly", false);
111 111
112 if (m_messageOnlineAgentsOnly) 112 if (m_messageOnlineAgentsOnly)
113 {
113 m_usersOnlineCache = new ExpiringCache<UUID, PresenceInfo[]>(); 114 m_usersOnlineCache = new ExpiringCache<UUID, PresenceInfo[]>();
115 }
116 else
117 {
118 m_log.Error("[Groups.Messaging]: GroupsMessagingModule V2 requires MessageOnlineUsersOnly = true");
119 m_groupMessagingEnabled = false;
120 return;
121 }
114 122
115 m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); 123 m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
116 124
@@ -260,7 +268,7 @@ namespace OpenSim.Groups
260 // Sending to offline members is not an option. 268 // Sending to offline members is not an option.
261 string[] t1 = groupMembers.ConvertAll<string>(gmd => gmd.AgentID.ToString()).ToArray(); 269 string[] t1 = groupMembers.ConvertAll<string>(gmd => gmd.AgentID.ToString()).ToArray();
262 270
263 // We cache in order not to overwhlem the presence service on large grids with many groups. This does 271 // We cache in order not to overwhelm the presence service on large grids with many groups. This does
264 // mean that members coming online will not see all group members until after m_usersOnlineCacheExpirySeconds has elapsed. 272 // mean that members coming online will not see all group members until after m_usersOnlineCacheExpirySeconds has elapsed.
265 // (assuming this is the same across all grid simulators). 273 // (assuming this is the same across all grid simulators).
266 if (!m_usersOnlineCache.TryGetValue(groupID, out onlineAgents)) 274 if (!m_usersOnlineCache.TryGetValue(groupID, out onlineAgents))