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

Mantis #7920: group info was not being updated in many situations. (regression) Putting back the heavy messaging.

LSLKeyTest
Diva Canto 2016-06-19 17:35:11 -07:00
parent 4f3da0a643
commit 8d99fe095a
6 changed files with 85 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
OpenSim/Addons/Groups/GroupsModule.cs
View File

@ -394,9 +394,8 @@ namespace OpenSim.Groups
OutgoingInstantMessage(msg, invitee);
IClientAPI client = GetActiveClient(invitee);
if (client != null)
SendDataUpdate(remoteClient, true);
UpdateAllClientsWithGroupInfo(invitee);
}
m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentIDStr(remoteClient), inviteID);
@ -1112,7 +1111,7 @@ namespace OpenSim.Groups
// SL sends out messages to everyone in the group
// Who all should receive updates and what should they be updated with?
SendAgentGroupDataUpdate(remoteClient, false);
UpdateAllClientsWithGroupInfo(ejecteeID);
}
public void InviteGroupRequest(IClientAPI remoteClient, UUID groupID, UUID invitedAgentID, UUID roleID)
@ -1226,15 +1225,43 @@ namespace OpenSim.Groups
}
}
/// <summary>
/// Send updates to all clients who might be interested in groups data for dataForClientID
/// </summary>
private void UpdateAllClientsWithGroupInfo(UUID dataForClientID)
{
if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
// TODO: Probably isn't nessesary to update every client in every scene.
// Need to examine client updates and do only what's nessesary.
lock (m_sceneList)
{
foreach (Scene scene in m_sceneList)
{
scene.ForEachClient(delegate (IClientAPI client) { SendAgentGroupDataUpdate(client, dataForClientID); });
}
}
}
public void SendAgentGroupDataUpdate(IClientAPI remoteClient)
{
SendAgentGroupDataUpdate(remoteClient, true);
SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient), true);
}
public void SendAgentGroupDataUpdate(IClientAPI remoteClient, UUID dataForClientID)
{
SendAgentGroupDataUpdate(remoteClient, dataForClientID, true);
}
private void SendAgentGroupDataUpdate(IClientAPI remoteClient, bool tellOthers)
{
SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient), tellOthers);
}
/// <summary>
/// Tell remoteClient about its agent groups, and optionally send title to others
/// </summary>
private void SendAgentGroupDataUpdate(IClientAPI remoteClient, bool tellOthers)
private void SendAgentGroupDataUpdate(IClientAPI remoteClient, UUID dataForClientID, bool tellOthers)
{
if (m_debugEnabled) m_log.InfoFormat("[Groups]: {0} called for {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, remoteClient.Name);
@ -1246,7 +1273,7 @@ namespace OpenSim.Groups
GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID);
IEventQueue eq = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
eq.GroupMembershipData(GetRequestingAgentID(remoteClient), membershipArray);
eq.GroupMembershipData(GetRequestingAgentID(remoteClient), dataForClientID, membershipArray);
remoteClient.RefreshGroupMembership();
}

4
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@ -585,9 +585,9 @@ namespace OpenSim.Region.ClientStack.Linden
Enqueue(item, avatarID);
}
public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
public void GroupMembershipData(UUID receiverAgent, UUID dataForClientID, GroupMembershipData[] data)
{
OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, data);
OSD item = EventQueueHelper.GroupMembershipData(receiverAgent, dataForClientID, data);
Enqueue(item, receiverAgent);
}

20
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
View File

@ -367,7 +367,7 @@ namespace OpenSim.Region.ClientStack.Linden
return groupUpdate;
}
public static OSD GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
public static OSD GroupMembershipData(UUID receiverAgent, UUID dataForAgentID, GroupMembershipData[] data)
{
OSDArray AgentData = new OSDArray(1);
OSDMap AgentDataMap = new OSDMap(1);
@ -379,15 +379,15 @@ namespace OpenSim.Region.ClientStack.Linden
foreach (GroupMembershipData membership in data)
{
//if (receiverAgent != dataForAgentID)
//{
// if (!membership.ListInProfile)
// {
// // If we're sending group info to remoteclient about another agent,
// // filter out groups the other agent doesn't want to share.
// continue;
// }
//}
if (receiverAgent != dataForAgentID)
{
if (!membership.ListInProfile)
{
// If we're sending group info to remoteclient about another agent,
// filter out groups the other agent doesn't want to share.
continue;
}
}
OSDMap GroupDataMap = new OSDMap(6);
OSDMap NewGroupDataMap = new OSDMap(1);

2
OpenSim/Region/Framework/Interfaces/IEventQueue.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Interfaces
bool isModerator, bool textMute);
void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID);
void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data);
void GroupMembershipData(UUID receiverAgent, UUID dataForClientID, GroupMembershipData[] data);
OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono);
OSD BuildEvent(string eventName, OSD eventBody);
void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID);

42
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -442,12 +442,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
OutgoingInstantMessage(msg, inviteInfo.AgentID);
IClientAPI client = GetActiveClient(inviteInfo.AgentID);
if (client != null)
SendDataUpdate(remoteClient, true);
// TODO: If the inviter is still online, they need an agent dataupdate
// and maybe group membership updates for the invitee
UpdateAllClientsWithGroupInfo(inviteInfo.AgentID);
m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID);
}
@ -1207,8 +1202,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// SL sends out messages to everyone in the group
// Who all should receive updates and what should they be updated with?
// just tell this the group change
SendAgentGroupDataUpdate(remoteClient, false);
// TODO fix the rest of sends
UpdateAllClientsWithGroupInfo(ejecteeID);
}
public void InviteGroupRequest(IClientAPI remoteClient, UUID groupID, UUID invitedAgentID, UUID roleID)
@ -1353,15 +1347,43 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
}
}
/// <summary>
/// Send updates to all clients who might be interested in groups data for dataForClientID
/// </summary>
private void UpdateAllClientsWithGroupInfo(UUID dataForClientID)
{
if (m_debugEnabled) m_log.InfoFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
// TODO: Probably isn't nessesary to update every client in every scene.
// Need to examine client updates and do only what's nessesary.
lock (m_sceneList)
{
foreach (Scene scene in m_sceneList)
{
scene.ForEachClient(delegate (IClientAPI client) { SendAgentGroupDataUpdate(client, dataForClientID); });
}
}
}
public void SendAgentGroupDataUpdate(IClientAPI remoteClient)
{
SendAgentGroupDataUpdate(remoteClient, true);
}
public void SendAgentGroupDataUpdate(IClientAPI remoteClient, UUID dataForClientID)
{
SendAgentGroupDataUpdate(remoteClient, dataForClientID, true);
}
private void SendAgentGroupDataUpdate(IClientAPI remoteClient, bool tellOthers)
{
SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient), tellOthers);
}
/// <summary>
/// Tell remoteClient about its agent groups, and optionally send title to others
/// </summary>
private void SendAgentGroupDataUpdate(IClientAPI remoteClient, bool tellOthers)
private void SendAgentGroupDataUpdate(IClientAPI remoteClient, UUID dataForClientID, bool tellOthers)
{
if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: {0} called for {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, remoteClient.Name);
@ -1373,7 +1395,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID);
IEventQueue eq = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
eq.GroupMembershipData(GetRequestingAgentID(remoteClient), membershipArray);
eq.GroupMembershipData(GetRequestingAgentID(remoteClient), dataForClientID, membershipArray);
remoteClient.RefreshGroupMembership();
}

2
OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
View File

@ -162,7 +162,7 @@ namespace OpenSim.Tests.Common
AddEvent(avatarID, "GroupMembership", groupUpdate);
}
public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data)
public void GroupMembershipData(UUID receiverAgent, UUID dataForClientID, GroupMembershipData[] data)
{
AddEvent(receiverAgent, "AgentGroupDataUpdate", data);
}