OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More bug fixes on group chat

TeleportWork
Diva Canto 2013-07-27 19:12:47 -07:00
parent 69975763d2
commit 18eca40af3
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Addons/Groups/GroupsMessagingModule.cs
View File

@ -132,7 +132,6 @@ namespace OpenSim.Groups
scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
scene.EventManager.OnClientLogin += OnClientLogin; scene.EventManager.OnClientLogin += OnClientLogin;
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
if (!m_groupMessagingEnabled) if (!m_groupMessagingEnabled)
@ -271,7 +270,8 @@ namespace OpenSim.Groups
} }
// Send to self first of all // Send to self first of all
im.toAgentID = im.fromAgentID; im.toAgentID = im.fromAgentID;
im.fromGroup = true;
ProcessMessageFromGroupSession(im); ProcessMessageFromGroupSession(im);
List<UUID> regions = new List<UUID>(); List<UUID> regions = new List<UUID>();
@ -330,8 +330,7 @@ namespace OpenSim.Groups
} }
} }
// Temporary for assessing how long it still takes to send messages to large online groups. if (m_debugEnabled)
if (m_messageOnlineAgentsOnly)
m_log.DebugFormat( m_log.DebugFormat(
"[Groups.Messaging]: SendMessageToGroup for group {0} with {1} visible members, {2} online took {3}ms", "[Groups.Messaging]: SendMessageToGroup for group {0} with {1} visible members, {2} online took {3}ms",
groupID, groupMembersCount, groupMembers.Count(), Environment.TickCount - requestStartTick); groupID, groupMembersCount, groupMembers.Count(), Environment.TickCount - requestStartTick);
@ -349,6 +348,7 @@ namespace OpenSim.Groups
if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: OnInstantMessage registered for {0}", client.Name); if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: OnInstantMessage registered for {0}", client.Name);
client.OnInstantMessage += OnInstantMessage; client.OnInstantMessage += OnInstantMessage;
ResetAgentGroupChatSessions(client.AgentId.ToString());
} }
private void OnGridInstantMessage(GridInstantMessage msg) private void OnGridInstantMessage(GridInstantMessage msg)
@ -432,16 +432,19 @@ namespace OpenSim.Groups
UUID AgentID = sp.UUID; UUID AgentID = sp.UUID;
msg.toAgentID = AgentID.Guid; msg.toAgentID = AgentID.Guid;
if (!hasAgentDroppedGroupChatSession(AgentID.ToString(), GroupID) if (!hasAgentDroppedGroupChatSession(AgentID.ToString(), GroupID))
&& !hasAgentBeenInvitedToGroupChatSession(AgentID.ToString(), GroupID))
{ {
AddAgentToSession(AgentID, GroupID, msg); if (!hasAgentBeenInvitedToGroupChatSession(AgentID.ToString(), GroupID))
AddAgentToSession(AgentID, GroupID, msg);
else
{
if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", sp.Name);
ProcessMessageFromGroupSession(msg);
}
} }
if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", sp.Name);
ProcessMessageFromGroupSession(msg);
}); });
} }
} }
} }
@ -664,12 +667,12 @@ namespace OpenSim.Groups
{ {
if (!sp.IsChildAgent) if (!sp.IsChildAgent)
{ {
if (m_debugEnabled) m_log.WarnFormat("[Groups.Messaging]: Found root agent for client : {0}", sp.ControllingClient.Name); if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Found root agent for client : {0}", sp.ControllingClient.Name);
return sp.ControllingClient; return sp.ControllingClient;
} }
else else
{ {
if (m_debugEnabled) m_log.WarnFormat("[Groups.Messaging]: Found child agent for client : {0}", sp.ControllingClient.Name); if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Found child agent for client : {0}", sp.ControllingClient.Name);
child = sp.ControllingClient; child = sp.ControllingClient;
} }
} }
@ -694,9 +697,10 @@ namespace OpenSim.Groups
public void ResetAgentGroupChatSessions(string agentID) public void ResetAgentGroupChatSessions(string agentID)
{ {
foreach (List<string> agentList in m_groupsAgentsDroppedFromChatSession.Values) foreach (List<string> agentList in m_groupsAgentsDroppedFromChatSession.Values)
{
agentList.Remove(agentID); agentList.Remove(agentID);
}
foreach (List<string> agentList in m_groupsAgentsInvitedToChatSession.Values)
agentList.Remove(agentID);
} }
public bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID) public bool hasAgentBeenInvitedToGroupChatSession(string agentID, UUID groupID)