aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorsacha2010-07-13 21:12:01 +0000
committersacha2010-07-13 21:12:01 +0000
commit8c2e1c6c29a9b3de6dd32c5cfd4eec72029a027d (patch)
tree3c8112b646ab91348502292fdf017b732492e83a /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentadding the 'wearble' case for llGetLocalPos. (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-8c2e1c6c29a9b3de6dd32c5cfd4eec72029a027d.zip
opensim-SC-8c2e1c6c29a9b3de6dd32c5cfd4eec72029a027d.tar.gz
opensim-SC-8c2e1c6c29a9b3de6dd32c5cfd4eec72029a027d.tar.bz2
opensim-SC-8c2e1c6c29a9b3de6dd32c5cfd4eec72029a027d.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 2cde8f3..0066158 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1082,7 +1082,6 @@ namespace OpenSim.Region.Framework.Scenes
1082 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; 1082 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
1083 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) 1083 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1084 item.CurrentPermissions &= ~(uint)PermissionMask.Modify; 1084 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1085 item.CurrentPermissions |= 8;
1086 } 1085 }
1087 item.OwnerChanged = true; 1086 item.OwnerChanged = true;
1088 item.CurrentPermissions &= item.NextPermissions; 1087 item.CurrentPermissions &= item.NextPermissions;