aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-01-21 00:21:27 +0000
committerJustin Clark-Casey (justincc)2015-01-21 00:21:27 +0000
commita846e63c707d624f5fe7504aba43fe7a57a18ea1 (patch)
tree57bef0ba957a85086b8aa8a080d0f1a391202ee4
parentminor: correct SceneCommunicationService.LogHeader spelling (diff)
downloadopensim-SC-a846e63c707d624f5fe7504aba43fe7a57a18ea1.zip
opensim-SC-a846e63c707d624f5fe7504aba43fe7a57a18ea1.tar.gz
opensim-SC-a846e63c707d624f5fe7504aba43fe7a57a18ea1.tar.bz2
opensim-SC-a846e63c707d624f5fe7504aba43fe7a57a18ea1.tar.xz
If [Permissions] serverside_object_permissions = false or the undocumented propogate_permissions = false, don't propogate permissions of prim inventory items.
This was a regression from 13f31fd (4 Nov 2013) Relates to http://opensimulator.org/mantis/view.php?id=7399
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c318e53..1ca250a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4836,7 +4836,10 @@ namespace OpenSim.Region.Framework.Scenes
4836 if (OwnerID != item.Owner) 4836 if (OwnerID != item.Owner)
4837 { 4837 {
4838 //LogPermissions("Before ApplyNextOwnerPermissions"); 4838 //LogPermissions("Before ApplyNextOwnerPermissions");
4839 ApplyNextOwnerPermissions(); 4839
4840 if (scene.Permissions.PropagatePermissions())
4841 ApplyNextOwnerPermissions();
4842
4840 //LogPermissions("After ApplyNextOwnerPermissions"); 4843 //LogPermissions("After ApplyNextOwnerPermissions");
4841 4844
4842 LastOwnerID = OwnerID; 4845 LastOwnerID = OwnerID;