1 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index e86887d..1f3f075 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -56,6 +56,9 @@ namespace OpenSim.Region.CoreModules.World.Land
         protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
         protected Dictionary<uint, UUID> m_listTransactions = new Dictionary<uint, UUID>();
 
+        protected ExpiringCache<UUID, bool> m_groupMemberCache = new ExpiringCache<UUID, bool>();
+        protected TimeSpan m_groupMemberCacheTimeout = TimeSpan.FromSeconds(30);  // cache invalidation after 30 seconds
+
         public bool[,] LandBitmap
         {
             get { return m_landBitmap; }
@@ -442,19 +445,30 @@ namespace OpenSim.Region.CoreModules.World.Land
                 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;
 
                     GroupMembershipData[] membership = groupsModule.GetMembershipData(avatar);
                     if (membership == null || membership.Length == 0)
+                    {
+                        m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
                         return false;
+                    }
 
                     foreach (GroupMembershipData d in membership)
                     {
                         if (d.GroupID == LandData.GroupID)
+                        {
+                            m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
                             return true;
+                        }
                     }
+                    m_groupMemberCache.Add(avatar, false, m_groupMemberCacheTimeout);
                     return false;
                 }
 
@@ -512,7 +526,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (HasGroupAccess(avatar))
                 return false;
 
-            return (!IsInLandAccessList(avatar));
+            return !IsInLandAccessList(avatar);
         }
 
         public bool IsInLandAccessList(UUID avatar)