aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-19 23:01:48 +0100
committerJustin Clark-Casey (justincc)2014-05-19 23:01:48 +0100
commit5ec3429843ecb8058698f663556ae1d4cae53434 (patch)
tree2b93005dfb29e7b51d7b5cc7ef01b758b438936e /OpenSim
parentAdd DebugMessagingEnabled = false to OpenSim.ini.example for consistency. Sl... (diff)
downloadopensim-SC_OLD-5ec3429843ecb8058698f663556ae1d4cae53434.zip
opensim-SC_OLD-5ec3429843ecb8058698f663556ae1d4cae53434.tar.gz
opensim-SC_OLD-5ec3429843ecb8058698f663556ae1d4cae53434.tar.bz2
opensim-SC_OLD-5ec3429843ecb8058698f663556ae1d4cae53434.tar.xz
On verbose groups messaging logging, count all operations in reported time when sending group messages, not just those after get group members and get presence status, as applicable
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Addons/Groups/GroupsMessagingModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index bd8db32..e6a4765 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -283,6 +283,8 @@ namespace OpenSim.Groups
283 public void SendMessageToGroup( 283 public void SendMessageToGroup(
284 GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition) 284 GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition)
285 { 285 {
286 int requestStartTick = Environment.TickCount;
287
286 UUID fromAgentID = new UUID(im.fromAgentID); 288 UUID fromAgentID = new UUID(im.fromAgentID);
287 289
288 // Unlike current XmlRpcGroups, Groups V2 can accept UUID.Zero when a perms check for the requesting agent 290 // Unlike current XmlRpcGroups, Groups V2 can accept UUID.Zero when a perms check for the requesting agent
@@ -315,8 +317,6 @@ namespace OpenSim.Groups
315// "[Groups.Messaging]: SendMessageToGroup called for group {0} with {1} visible members, {2} online", 317// "[Groups.Messaging]: SendMessageToGroup called for group {0} with {1} visible members, {2} online",
316// groupID, groupMembersCount, groupMembers.Count()); 318// groupID, groupMembersCount, groupMembers.Count());
317 319
318 int requestStartTick = Environment.TickCount;
319
320 im.imSessionID = groupID.Guid; 320 im.imSessionID = groupID.Guid;
321 im.fromGroup = true; 321 im.fromGroup = true;
322 IClientAPI thisClient = GetActiveClient(fromAgentID); 322 IClientAPI thisClient = GetActiveClient(fromAgentID);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 09bbec2..e1b6abb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -274,6 +274,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
274 public void SendMessageToGroup( 274 public void SendMessageToGroup(
275 GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition) 275 GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition)
276 { 276 {
277 int requestStartTick = Environment.TickCount;
278
277 List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(sendingAgentForGroupCalls, groupID); 279 List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(sendingAgentForGroupCalls, groupID);
278 int groupMembersCount = groupMembers.Count; 280 int groupMembersCount = groupMembers.Count;
279 HashSet<string> attemptDeliveryUuidSet = null; 281 HashSet<string> attemptDeliveryUuidSet = null;
@@ -313,9 +315,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
313 m_log.DebugFormat( 315 m_log.DebugFormat(
314 "[GROUPS-MESSAGING]: SendMessageToGroup called for group {0} with {1} visible members", 316 "[GROUPS-MESSAGING]: SendMessageToGroup called for group {0} with {1} visible members",
315 groupID, groupMembers.Count); 317 groupID, groupMembers.Count);
316 } 318 }
317
318 int requestStartTick = Environment.TickCount;
319 319
320 foreach (GroupMembersData member in groupMembers) 320 foreach (GroupMembersData member in groupMembers)
321 { 321 {