aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2013-06-23 01:14:07 +0200
committerMelanie2013-06-23 01:14:07 +0200
commit8e9d6c6c56c7169adfa4b99c328933df4b68107b (patch)
treeec544566c2d40d6d25cca36e609b45fc7052caf6 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentAllow coalesced objects to be rezzed even if they extend past the sim bounds (diff)
downloadopensim-SC_OLD-8e9d6c6c56c7169adfa4b99c328933df4b68107b.zip
opensim-SC_OLD-8e9d6c6c56c7169adfa4b99c328933df4b68107b.tar.gz
opensim-SC_OLD-8e9d6c6c56c7169adfa4b99c328933df4b68107b.tar.bz2
opensim-SC_OLD-8e9d6c6c56c7169adfa4b99c328933df4b68107b.tar.xz
Fix prim locking to behave like SL
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index a99261f..f306651 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3488,8 +3488,8 @@ namespace OpenSim.Region.Framework.Scenes
3488 part.ClonePermissions(RootPart); 3488 part.ClonePermissions(RootPart);
3489 }); 3489 });
3490 3490
3491 uint lockMask = ~(uint)PermissionMask.Move; 3491 uint lockMask = ~(uint)(PermissionMask.Move | PermissionMask.Modify);
3492 uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move; 3492 uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move | PermissionMask.Modify);
3493 RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); 3493 RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
3494 RootPart.ScheduleFullUpdate(); 3494 RootPart.ScheduleFullUpdate();
3495 } 3495 }