diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/PermissionManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs index a6acca7..27ec9d1 100644 --- a/OpenSim/Region/Environment/PermissionManager.cs +++ b/OpenSim/Region/Environment/PermissionManager.cs | |||
@@ -401,7 +401,7 @@ namespace OpenSim.Region.Environment | |||
401 | permission = true; | 401 | permission = true; |
402 | 402 | ||
403 | // Locked | 403 | // Locked |
404 | if ((task.RootPart.OwnerMask & PERM_LOCKED) != 0) | 404 | if ((task.RootPart.OwnerMask & PERM_LOCKED) == 0) |
405 | permission = false; | 405 | permission = false; |
406 | 406 | ||
407 | } | 407 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 612cca4..f925955 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -1038,6 +1038,8 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1038 | { | 1038 | { |
1039 | m_host.AddScriptLPS(1); | 1039 | m_host.AddScriptLPS(1); |
1040 | m_host.UpdateRotation(new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s)); | 1040 | m_host.UpdateRotation(new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s)); |
1041 | // Update rotation does not move the object in the physics scene if it's a linkset. | ||
1042 | m_host.ParentGroup.AbsolutePosition = m_host.ParentGroup.AbsolutePosition; | ||
1041 | } | 1043 | } |
1042 | 1044 | ||
1043 | public LSL_Types.Quaternion llGetRot() | 1045 | public LSL_Types.Quaternion llGetRot() |