diff options
author | Melanie | 2010-01-15 20:19:06 +0000 |
---|---|---|
committer | Melanie | 2010-01-15 20:19:06 +0000 |
commit | 884410501e50f0abb09ef1339ac74e22c2dfd39f (patch) | |
tree | 9a6415636c3d8388890228f10bc55aa1816646a3 /OpenSim/Region | |
parent | Adds Land Banning. (diff) | |
download | opensim-SC_OLD-884410501e50f0abb09ef1339ac74e22c2dfd39f.zip opensim-SC_OLD-884410501e50f0abb09ef1339ac74e22c2dfd39f.tar.gz opensim-SC_OLD-884410501e50f0abb09ef1339ac74e22c2dfd39f.tar.bz2 opensim-SC_OLD-884410501e50f0abb09ef1339ac74e22c2dfd39f.tar.xz |
Allow renaming of items that contain no-mod items
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 18ec25f..dd4c14b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1803,8 +1803,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1803 | } | 1803 | } |
1804 | else | 1804 | else |
1805 | { | 1805 | { |
1806 | item.BasePermissions = objectGroup.GetEffectivePermissions(); | 1806 | uint ownerPerms = objectGroup.GetEffectivePermissions(); |
1807 | item.CurrentPermissions = objectGroup.GetEffectivePermissions(); | 1807 | if ((objectGroup.RootPart.OwnerMask & (uint)PermissionMask.Modify) != 0) |
1808 | ownerPerms |= (uint)PermissionMask.Modify; | ||
1809 | |||
1810 | item.BasePermissions = ownerPerms; | ||
1811 | item.CurrentPermissions = ownerPerms; | ||
1812 | |||
1808 | item.NextPermissions = objectGroup.RootPart.NextOwnerMask; | 1813 | item.NextPermissions = objectGroup.RootPart.NextOwnerMask; |
1809 | item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; | 1814 | item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; |
1810 | item.GroupPermissions = objectGroup.RootPart.GroupMask; | 1815 | item.GroupPermissions = objectGroup.RootPart.GroupMask; |