diff options
author | Melanie Thielker | 2008-11-27 03:17:00 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-27 03:17:00 +0000 |
commit | 6b7ba29986460a273a05f365e61cdbc0c71b237a (patch) | |
tree | 772182f2896eb2d1f2179e600be6a183654a201a /OpenSim/Region/Environment | |
parent | Added local lookup before we ask the messaging server. (diff) | |
download | opensim-SC_OLD-6b7ba29986460a273a05f365e61cdbc0c71b237a.zip opensim-SC_OLD-6b7ba29986460a273a05f365e61cdbc0c71b237a.tar.gz opensim-SC_OLD-6b7ba29986460a273a05f365e61cdbc0c71b237a.tar.bz2 opensim-SC_OLD-6b7ba29986460a273a05f365e61cdbc0c71b237a.tar.xz |
Fix permission propagation that was broken some revision back, causing
sold/given prim to become full perm.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneGraph.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 4 |
3 files changed, 5 insertions, 5 deletions
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 | |||
4270 | foreach (SceneObjectPart child in partList) | 4270 | foreach (SceneObjectPart child in partList) |
4271 | { | 4271 | { |
4272 | child.Inventory.ChangeInventoryOwner(remoteClient.AgentId); | 4272 | child.Inventory.ChangeInventoryOwner(remoteClient.AgentId); |
4273 | child.Inventory.ApplyNextOwnerPermissions(); | 4273 | child.ApplyNextOwnerPermissions(); |
4274 | } | 4274 | } |
4275 | } | 4275 | } |
4276 | 4276 | ||
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 | |||
423 | { | 423 | { |
424 | SceneObjectGroup group = (SceneObjectGroup)obj; | 424 | SceneObjectGroup group = (SceneObjectGroup)obj; |
425 | 425 | ||
426 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) | 426 | if (group.OwnerID != remoteClient.AgentId) |
427 | group.SetGroup(GroupID, remoteClient); | 427 | group.SetGroup(GroupID, remoteClient); |
428 | else | ||
429 | remoteClient.SendAgentAlertMessage("You don't have permission to set the group", false); | ||
430 | } | 428 | } |
431 | } | 429 | } |
432 | } | 430 | } |
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 | |||
302 | public void ApplyNextOwnerPermissions() | 302 | public void ApplyNextOwnerPermissions() |
303 | { | 303 | { |
304 | foreach (SceneObjectPart part in m_parts.Values) | 304 | foreach (SceneObjectPart part in m_parts.Values) |
305 | part.Inventory.ApplyNextOwnerPermissions(); | 305 | { |
306 | part.ApplyNextOwnerPermissions(); | ||
307 | } | ||
306 | } | 308 | } |
307 | 309 | ||
308 | public string GetStateSnapshot() | 310 | public string GetStateSnapshot() |