Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Tests/Common/Mock/TestClient.cs

2 files changed, 5 insertions, 7 deletions

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 4a654a3..82ccaf8 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -487,7 +487,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return false;
         }
 
-        protected bool IsFriendWithPerms(UUID user,UUID objectOwner)
+        protected bool IsFriendWithPerms(UUID user, UUID objectOwner)
         {            
             if (user == UUID.Zero)
                 return false;
@@ -495,11 +495,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (m_friendsModule == null)
                 return false;
 
-            uint friendPerms = m_friendsModule.GetFriendPerms(user, objectOwner);
-            if ((friendPerms & (uint)FriendRights.CanModifyObjects) != 0)
-                return true;
-
-            return false;
+            int friendPerms = m_friendsModule.GetRightsGrantedByFriend(user, objectOwner);
+            return (friendPerms & (int)FriendRights.CanModifyObjects) != 0;
         }
 
         protected bool IsEstateManager(UUID user)
@@ -508,6 +505,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         
             return m_scene.RegionInfo.EstateSettings.IsEstateManager(user);
         }
+
 #endregion
 
         public bool PropagatePermissions()
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index ab8e1bf..f5f35bb 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
             }
             
             SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
-            SceneObjectPart rootPart = sceneObject.GetChildPart(sceneObject.UUID);
+            SceneObjectPart rootPart = sceneObject.GetPart(sceneObject.UUID);
             
             // if grass or tree, make phantom
             //rootPart.TrimPermissions();