diff options
Diffstat (limited to 'OpenSim/Addons/Groups')
4 files changed, 13 insertions, 5 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)) |
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index 7f453db..f11606a 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs | |||
@@ -101,7 +101,7 @@ namespace OpenSim.Groups | |||
101 | { | 101 | { |
102 | scene.RegisterModuleInterface<IGroupsModule>(this); | 102 | scene.RegisterModuleInterface<IGroupsModule>(this); |
103 | scene.AddCommand( | 103 | scene.AddCommand( |
104 | "debug", | 104 | "Debug", |
105 | this, | 105 | this, |
106 | "debug groups verbose", | 106 | "debug groups verbose", |
107 | "debug groups verbose <true|false>", | 107 | "debug groups verbose <true|false>", |
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index d2bcba5..dc36787 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -158,7 +158,7 @@ namespace OpenSim.Groups | |||
158 | } | 158 | } |
159 | catch (Exception e) | 159 | catch (Exception e) |
160 | { | 160 | { |
161 | m_log.DebugFormat("[Groups.RobustHGConnector]: Exception {0}", e.StackTrace); | 161 | m_log.Error(string.Format("[Groups.RobustHGConnector]: Exception {0} ", e.Message), e); |
162 | } | 162 | } |
163 | 163 | ||
164 | return FailureResult(); | 164 | return FailureResult(); |
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index 249d974..616afa9 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Groups | |||
140 | } | 140 | } |
141 | catch (Exception e) | 141 | catch (Exception e) |
142 | { | 142 | { |
143 | m_log.DebugFormat("[GROUPS HANDLER]: Exception {0}", e.StackTrace); | 143 | m_log.Error(string.Format("[GROUPS HANDLER]: Exception {0} ", e.Message), e); |
144 | } | 144 | } |
145 | 145 | ||
146 | return FailureResult(); | 146 | return FailureResult(); |