aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Addons
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/Addons
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/Addons')
-rw-r--r--OpenSim/Addons/Groups/GroupsMessagingModule.cs4
1 files changed, 2 insertions, 2 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);