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

Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-04-05 08:34:03 -04:00
parent f266e19243 67537f3596
commit 2d9971ea93
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -446,7 +446,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
if (d.GroupID == LandData.GroupID)
{
m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
m_groupMemberCache.Add(avatar, true, m_groupMemberCacheTimeout);
return true;
}
}
@ -454,10 +454,7 @@ namespace OpenSim.Region.CoreModules.World.Land
return false;
}
if (!sp.ControllingClient.IsGroupMember(LandData.GroupID))
return false;
return true;
return sp.ControllingClient.IsGroupMember(LandData.GroupID);
}
return false;
}

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

@ -1294,7 +1294,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
OnAgentDataUpdateRequest(remoteClient, dataForAgentID, UUID.Zero);
// 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
// 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);
remoteClient.SendAvatarGroupsReply(dataForAgentID, membershipArray);
if (remoteClient.AgentId == dataForAgentID)
remoteClient.RefreshGroupMembership();
}
/// <summary>