Merge branch 'master' of /home/opensim/var/repo/opensim
commit
2d9971ea93
|
@ -446,7 +446,7 @@ namespace OpenSim.Region.CoreModules.World.Land
|
||||||
{
|
{
|
||||||
if (d.GroupID == LandData.GroupID)
|
if (d.GroupID == LandData.GroupID)
|
||||||
{
|
{
|
||||||
m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
|
m_groupMemberCache.Add(avatar, true, m_groupMemberCacheTimeout);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -454,10 +454,7 @@ namespace OpenSim.Region.CoreModules.World.Land
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!sp.ControllingClient.IsGroupMember(LandData.GroupID))
|
return sp.ControllingClient.IsGroupMember(LandData.GroupID);
|
||||||
return false;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1294,7 +1294,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||||
|
|
||||||
OnAgentDataUpdateRequest(remoteClient, dataForAgentID, UUID.Zero);
|
OnAgentDataUpdateRequest(remoteClient, dataForAgentID, UUID.Zero);
|
||||||
|
|
||||||
|
|
||||||
// Need to send a group membership update to the client
|
// Need to send a group membership update to the client
|
||||||
// UDP version doesn't seem to behave nicely. But we're going to send it out here
|
// UDP version doesn't seem to behave nicely. But we're going to send it out here
|
||||||
// with an empty group membership to hopefully remove groups being displayed due
|
// with an empty group membership to hopefully remove groups being displayed due
|
||||||
|
@ -1305,6 +1304,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||||
SendGroupMembershipInfoViaCaps(remoteClient, dataForAgentID, membershipArray);
|
SendGroupMembershipInfoViaCaps(remoteClient, dataForAgentID, membershipArray);
|
||||||
remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray);
|
remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray);
|
||||||
|
|
||||||
|
if (remoteClient.AgentId == dataForAgentID)
|
||||||
|
remoteClient.RefreshGroupMembership();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in New Issue