From 6b7ba29986460a273a05f365e61cdbc0c71b237a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 27 Nov 2008 03:17:00 +0000
Subject: Fix permission propagation that was broken some revision back,
 causing sold/given prim to become full perm.

---
 OpenSim/Region/Environment/Scenes/Scene.cs                      | 2 +-
 OpenSim/Region/Environment/Scenes/SceneGraph.cs                 | 4 +---
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index c20c718..71ef524 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -4270,7 +4270,7 @@ namespace OpenSim.Region.Environment.Scenes
                     foreach (SceneObjectPart child in partList)
                     {
                         child.Inventory.ChangeInventoryOwner(remoteClient.AgentId);
-                        child.Inventory.ApplyNextOwnerPermissions();
+                        child.ApplyNextOwnerPermissions();
                     }
                 }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
index 0c4e899..3b6aa15 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
@@ -423,10 +423,8 @@ namespace OpenSim.Region.Environment.Scenes
                     {
                         SceneObjectGroup group = (SceneObjectGroup)obj;
 
-                        if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
+                        if (group.OwnerID != remoteClient.AgentId)
                             group.SetGroup(GroupID, remoteClient);
-                        else
-                            remoteClient.SendAgentAlertMessage("You don't have permission to set the group", false);
                     }
                 }
             }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 62e680b..053e0da 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -302,7 +302,9 @@ namespace OpenSim.Region.Environment.Scenes
         public void ApplyNextOwnerPermissions()
         {
             foreach (SceneObjectPart part in m_parts.Values)
-                part.Inventory.ApplyNextOwnerPermissions();
+            {
+                part.ApplyNextOwnerPermissions();
+            }
         }
 
         public string GetStateSnapshot()
-- 
cgit v1.1