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

1 files changed, 8 insertions, 20 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index bd1dd66..d0517b7 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -290,28 +290,16 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         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 =
-                        m_scene.RequestModuleInterface<IGroupsModule>();
+                ScenePresence sp;
+                if (!m_scene.TryGetScenePresence(avatar, out sp))
+                    return false;
 
-                List<UUID> agentGroups = new List<UUID>();
-                if (groupsModule != null)
-                {
-                    GroupMembershipData[] GroupMembership =
-                            groupsModule.GetMembershipData(avatar);
-
-                    if (GroupMembership != null)
-                    {
-                        for (int i = 0; i < GroupMembership.Length; i++)
-                        {
-                            if (LandData.GroupID == GroupMembership[i].GroupID)
-                            {
-                                return true;
-                            }
-                        }
-                    }
-                }
+                if (!sp.ControllingClient.IsGroupMember(LandData.GroupID))
+                    return false;
+                
+                return true;
             }
             return false;
         }