From e4406c846d74212493890a46922292cd7fec2ea5 Mon Sep 17 00:00:00 2001
From: Snoopy Pfeffer
Date: Thu, 5 Apr 2012 10:25:54 +0200
Subject: Group based access restrictions to parcels require group membership,
 but not that this group is active for that user.

---
 .../Region/CoreModules/World/Land/LandObject.cs    | 47 ++++++++++------------
 1 file changed, 22 insertions(+), 25 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index ced7b52..a7c7cc5 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -424,37 +424,34 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
             if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)
             {
-                ScenePresence sp;
-                if (!m_scene.TryGetScenePresence(avatar, out sp))
-                {
-                    bool isMember;
-                    if (m_groupMemberCache.TryGetValue(avatar, out isMember))
-                        return isMember;
-
-                    IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
-                    if (groupsModule == null)
-                        return false;
+                bool isMember;
+                if (m_groupMemberCache.TryGetValue(avatar, out isMember))
+                    return isMember;
 
-                    GroupMembershipData[] membership = groupsModule.GetMembershipData(avatar);
-                    if (membership == null || membership.Length == 0)
-                    {
-                        m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
-                        return false;
-                    }
+                IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
+                if (groupsModule == null)
+                {
+                    m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
+                    return false;
+                }
 
-                    foreach (GroupMembershipData d in membership)
-                    {
-                        if (d.GroupID == LandData.GroupID)
-                        {
-                            m_groupMemberCache.Add(avatar, true, m_groupMemberCacheTimeout);
-                            return true;
-                        }
-                    }
+                GroupMembershipData[] membership = groupsModule.GetMembershipData(avatar);
+                if (membership == null || membership.Length == 0)
+                {
                     m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
                     return false;
                 }
 
-                return sp.ControllingClient.IsGroupMember(LandData.GroupID);
+                foreach (GroupMembershipData d in membership)
+                {
+                    if (d.GroupID == LandData.GroupID)
+                    {
+                        m_groupMemberCache.Add(avatar, true, m_groupMemberCacheTimeout);
+                        return true;
+                    }
+                }
+                m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
+                return false;
             }
             return false;
         }
-- 
cgit v1.1