aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2012-12-16 02:05:01 +0100
committerMelanie2012-12-16 02:05:01 +0100
commit7d8c2b342c77cd4c5b26ee9500b5d9383b8bae77 (patch)
treef4a869582b9df3cad9454aea541bdd2d1a40fdfe /OpenSim/Region/Framework/Scenes
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC-7d8c2b342c77cd4c5b26ee9500b5d9383b8bae77.zip
opensim-SC-7d8c2b342c77cd4c5b26ee9500b5d9383b8bae77.tar.gz
opensim-SC-7d8c2b342c77cd4c5b26ee9500b5d9383b8bae77.tar.bz2
opensim-SC-7d8c2b342c77cd4c5b26ee9500b5d9383b8bae77.tar.xz
Fix locking objects
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b9f9c86..4ad8b11 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3449,7 +3449,9 @@ namespace OpenSim.Region.Framework.Scenes
3449 part.ClonePermissions(RootPart); 3449 part.ClonePermissions(RootPart);
3450 }); 3450 });
3451 3451
3452 RootPart.OwnerMask = newOwnerMask | foldedPerms; 3452 uint lockMask = ~(uint)PermissionMask.Move;
3453 uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move;
3454 RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
3453 RootPart.ScheduleFullUpdate(); 3455 RootPart.ScheduleFullUpdate();
3454 } 3456 }
3455 3457