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

Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie 2010-10-23 00:22:23 +01:00
parent 7f74dc1b14 9fa915bdef
commit 9a78281f82
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,28 +290,16 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool HasGroupAccess(UUID avatar) public bool HasGroupAccess(UUID avatar)
{ {
if ((LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup) if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)
{ {
IGroupsModule groupsModule = ScenePresence sp;
m_scene.RequestModuleInterface<IGroupsModule>(); if (!m_scene.TryGetScenePresence(avatar, out sp))
return false;
List<UUID> agentGroups = new List<UUID>(); if (!sp.ControllingClient.IsGroupMember(LandData.GroupID))
if (groupsModule != null) return false;
{
GroupMembershipData[] GroupMembership =
groupsModule.GetMembershipData(avatar);
if (GroupMembership != null) return true;
{
for (int i = 0; i < GroupMembership.Length; i++)
{
if (LandData.GroupID == GroupMembership[i].GroupID)
{
return true;
}
}
}
}
} }
return false; return false;
} }