Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

1 files changed, 2 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 1f3f075..509c4d7 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -464,7 +464,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;
                         }
                     }
@@ -472,10 +472,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;
         }