From dc79146d01f35d63438bf71cfee702b628289683 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 21 Mar 2008 00:52:41 +0000 Subject: * Fix for #499: linked primsets don't rotate properly when using a door script that works OK on SL * Fix for #693: llSetRot malfunction in linked prims causing instance of invisible prim --- OpenSim/Region/Environment/PermissionManager.cs | 2 +- OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 permission = true; // Locked - if ((task.RootPart.OwnerMask & PERM_LOCKED) != 0) + if ((task.RootPart.OwnerMask & PERM_LOCKED) == 0) permission = false; } 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 { m_host.AddScriptLPS(1); m_host.UpdateRotation(new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s)); + // Update rotation does not move the object in the physics scene if it's a linkset. + m_host.ParentGroup.AbsolutePosition = m_host.ParentGroup.AbsolutePosition; } public LSL_Types.Quaternion llGetRot() -- cgit v1.1