aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-10-27 01:20:21 +0000
committerUbitUmarov2015-10-27 01:20:21 +0000
commit114ac593144750e1fd5b3f9d7ce2b7b1acfb29e6 (patch)
tree36f2636d07d4d985b649089ae9ac0842a8bd9ac1
parentfriends rights to edit objects display on viewers fixed. This needs to be op... (diff)
downloadopensim-SC_OLD-114ac593144750e1fd5b3f9d7ce2b7b1acfb29e6.zip
opensim-SC_OLD-114ac593144750e1fd5b3f9d7ce2b7b1acfb29e6.tar.gz
opensim-SC_OLD-114ac593144750e1fd5b3f9d7ce2b7b1acfb29e6.tar.bz2
opensim-SC_OLD-114ac593144750e1fd5b3f9d7ce2b7b1acfb29e6.tar.xz
dont tell clients that we can edit a friend's attachments when we do forbid it
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 12e8fb1..765c1f2 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
705 if (user == objectOwner) 705 if (user == objectOwner)
706 return PermissionClass.Owner; 706 return PermissionClass.Owner;
707 707
708 if (IsFriendWithPerms(user, objectOwner)) 708 if (IsFriendWithPerms(user, objectOwner) && !obj.ParentGroup.IsAttachment)
709 return PermissionClass.Owner; 709 return PermissionClass.Owner;
710 710
711 // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set 711 // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set