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

cleanup a bit AgentGroupDataUpdate sending

LSLKeyTest
UbitUmarov 2016-07-01 17:31:31 +01:00
parent 6deced0193
commit 1777324a86
3 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1277,13 +1277,9 @@ namespace OpenSim.Groups
SendDataUpdate(remoteClient, tellOthers); SendDataUpdate(remoteClient, tellOthers);
GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID); GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID);
IEventQueue eq = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
if (eq != null)
eq.GroupMembershipData(agentID, membershipArray);
else
remoteClient.SendGroupMembership(membershipArray);
remoteClient.RefreshGroupMembership(); remoteClient.RefreshGroupMembership();
remoteClient.SendAgentGroupDataUpdate(agentID, membershipArray);
} }
/// <summary> /// <summary>

63
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -2777,11 +2777,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Groupupdate.GroupData = Groups; Groupupdate.GroupData = Groups;
Groupupdate.AgentData = new AgentGroupDataUpdatePacket.AgentDataBlock(); Groupupdate.AgentData = new AgentGroupDataUpdatePacket.AgentDataBlock();
Groupupdate.AgentData.AgentID = AgentId; Groupupdate.AgentData.AgentID = AgentId;
//OutPacket(Groupupdate, ThrottleOutPacketType.Task);
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
try try
{ {
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
if (eq != null) if (eq != null)
{ {
eq.GroupMembership(Groupupdate, this.AgentId); eq.GroupMembership(Groupupdate, this.AgentId);
@ -2791,8 +2790,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
m_log.Error("Unable to send group membership data via eventqueue - exception: " + ex.ToString()); m_log.Error("Unable to send group membership data via eventqueue - exception: " + ex.ToString());
m_log.Warn("sending group membership data via UDP"); m_log.Warn("sending group membership data via UDP");
OutPacket(Groupupdate, ThrottleOutPacketType.Task); eq = null;
} }
if(eq == null) // udp if no eq
OutPacket(Groupupdate, ThrottleOutPacketType.Task);
} }
public void SendPartPhysicsProprieties(ISceneEntity entity) public void SendPartPhysicsProprieties(ISceneEntity entity)
@ -3423,41 +3426,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data) public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data)
{ {
if(avatarID != AgentId)
m_log.Debug("[CLIENT]: SendAgentGroupDataUpdate avatarID != AgentId");
IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>();
if(eq != null)
// use UDP if no caps
if (eq == null)
{ {
SendGroupMembership(data); eq.GroupMembershipData(avatarID,data);
} }
else
OSDMap llsd = new OSDMap(3);
OSDArray AgentData = new OSDArray(1);
OSDMap AgentDataMap = new OSDMap(1);
AgentDataMap.Add("AgentID", OSD.FromUUID(this.AgentId));
AgentDataMap.Add("AvatarID", OSD.FromUUID(avatarID));
AgentData.Add(AgentDataMap);
llsd.Add("AgentData", AgentData);
OSDArray GroupData = new OSDArray(data.Length);
OSDArray NewGroupData = new OSDArray(data.Length);
foreach (GroupMembershipData m in data)
{ {
OSDMap GroupDataMap = new OSDMap(6); // use UDP if no caps
OSDMap NewGroupDataMap = new OSDMap(1); AgentGroupDataUpdatePacket Groupupdate = new AgentGroupDataUpdatePacket();
GroupDataMap.Add("GroupPowers", OSD.FromULong(m.GroupPowers)); AgentGroupDataUpdatePacket.GroupDataBlock[] Groups = new AgentGroupDataUpdatePacket.GroupDataBlock[data.Length];
GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(m.AcceptNotices)); for (int i = 0; i < data.Length; i++)
GroupDataMap.Add("GroupTitle", OSD.FromString(m.GroupTitle)); {
GroupDataMap.Add("GroupID", OSD.FromUUID(m.GroupID)); AgentGroupDataUpdatePacket.GroupDataBlock Group = new AgentGroupDataUpdatePacket.GroupDataBlock();
GroupDataMap.Add("GroupName", OSD.FromString(m.GroupName)); Group.AcceptNotices = data[i].AcceptNotices;
GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(m.GroupPicture)); Group.Contribution = data[i].Contribution;
NewGroupDataMap.Add("ListInProfile", OSD.FromBoolean(m.ListInProfile)); Group.GroupID = data[i].GroupID;
GroupData.Add(GroupDataMap); Group.GroupInsigniaID = data[i].GroupPicture;
NewGroupData.Add(NewGroupDataMap); Group.GroupName = Util.StringToBytes256(data[i].GroupName);
Group.GroupPowers = data[i].GroupPowers;
Groups[i] = Group;
}
Groupupdate.GroupData = Groups;
Groupupdate.AgentData = new AgentGroupDataUpdatePacket.AgentDataBlock();
Groupupdate.AgentData.AgentID = avatarID;
OutPacket(Groupupdate, ThrottleOutPacketType.Task);
} }
llsd.Add("GroupData", GroupData);
llsd.Add("NewGroupData", NewGroupData);
eq.Enqueue(BuildEvent("AgentGroupDataUpdate", llsd), this.AgentId);
} }
public void SendJoinGroupReply(UUID groupID, bool success) public void SendJoinGroupReply(UUID groupID, bool success)

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

@ -1409,12 +1409,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID); GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID);
IEventQueue eq = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
if (eq != null)
eq.GroupMembershipData(agentID, membershipArray);
else
remoteClient.SendGroupMembership(membershipArray);
remoteClient.RefreshGroupMembership(); remoteClient.RefreshGroupMembership();
remoteClient.SendAgentGroupDataUpdate(agentID, membershipArray);
} }
/// <summary> /// <summary>