From 7d699514a5559e2a7670a2259067cd8dd29c011c Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sun, 19 Apr 2015 20:22:55 -0700 Subject: [PATCH] Revert "Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)" This change sees to enable general moving of objects with touch scripts. Reverting until the move permissions are understood. This reverts commit 28ce3238020c4dca8f9aef711daf730bccf0d2f0. --- .../Framework/Scenes/SceneObjectGroup.cs | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 9e5314db5e..0a1a226c36 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2672,20 +2672,16 @@ namespace OpenSim.Region.Framework.Scenes } else { - NonPhysicalGrabMovement(pos); + //NonPhysicalGrabMovement(pos); } } else { - NonPhysicalGrabMovement(pos); + //NonPhysicalGrabMovement(pos); } } } - /// - /// Apply possition for grabbing non-physical linksets (ctrl+drag) - /// - /// New Position public void NonPhysicalGrabMovement(Vector3 pos) { AbsolutePosition = pos; @@ -2785,26 +2781,16 @@ namespace OpenSim.Region.Framework.Scenes } else { - NonPhysicalSpinMovement(newOrientation); + //NonPhysicalSpinMovement(pos); } } else { - NonPhysicalSpinMovement(newOrientation); + //NonPhysicalSpinMovement(pos); } } } - /// - /// Apply rotation for spinning non-physical linksets (ctrl+shift+drag) - /// - /// New Rotation - private void NonPhysicalSpinMovement(Quaternion newOrientation) - { - UpdateGroupRotationR(newOrientation); - m_rootPart.SendTerseUpdateToAllClients(); - } - /// /// Set the name of a prim ///