diff options
author | Robert Adams | 2015-04-19 20:22:55 -0700 |
---|---|---|
committer | Robert Adams | 2015-04-19 20:22:55 -0700 |
commit | 7d699514a5559e2a7670a2259067cd8dd29c011c (patch) | |
tree | 18369402eaa3eab86736a483ae94f851fd155661 /OpenSim/Region | |
parent | Avoid deadlock in NPCModule between DeleteNPC and GetNPC on m_avatars (diff) | |
download | opensim-SC-7d699514a5559e2a7670a2259067cd8dd29c011c.zip opensim-SC-7d699514a5559e2a7670a2259067cd8dd29c011c.tar.gz opensim-SC-7d699514a5559e2a7670a2259067cd8dd29c011c.tar.bz2 opensim-SC-7d699514a5559e2a7670a2259067cd8dd29c011c.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 9e5314d..0a1a226 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2672,20 +2672,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
2672 | } | 2672 | } |
2673 | else | 2673 | else |
2674 | { | 2674 | { |
2675 | NonPhysicalGrabMovement(pos); | 2675 | //NonPhysicalGrabMovement(pos); |
2676 | } | 2676 | } |
2677 | } | 2677 | } |
2678 | else | 2678 | else |
2679 | { | 2679 | { |
2680 | NonPhysicalGrabMovement(pos); | 2680 | //NonPhysicalGrabMovement(pos); |
2681 | } | 2681 | } |
2682 | } | 2682 | } |
2683 | } | 2683 | } |
2684 | 2684 | ||
2685 | /// <summary> | ||
2686 | /// Apply possition for grabbing non-physical linksets (ctrl+drag) | ||
2687 | /// </summary> | ||
2688 | /// <param name="pos">New Position</param> | ||
2689 | public void NonPhysicalGrabMovement(Vector3 pos) | 2685 | public void NonPhysicalGrabMovement(Vector3 pos) |
2690 | { | 2686 | { |
2691 | AbsolutePosition = pos; | 2687 | AbsolutePosition = pos; |
@@ -2785,27 +2781,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
2785 | } | 2781 | } |
2786 | else | 2782 | else |
2787 | { | 2783 | { |
2788 | NonPhysicalSpinMovement(newOrientation); | 2784 | //NonPhysicalSpinMovement(pos); |
2789 | } | 2785 | } |
2790 | } | 2786 | } |
2791 | else | 2787 | else |
2792 | { | 2788 | { |
2793 | NonPhysicalSpinMovement(newOrientation); | 2789 | //NonPhysicalSpinMovement(pos); |
2794 | } | 2790 | } |
2795 | } | 2791 | } |
2796 | } | 2792 | } |
2797 | 2793 | ||
2798 | /// <summary> | 2794 | /// <summary> |
2799 | /// Apply rotation for spinning non-physical linksets (ctrl+shift+drag) | ||
2800 | /// </summary> | ||
2801 | /// <param name="newOrientation">New Rotation</param> | ||
2802 | private void NonPhysicalSpinMovement(Quaternion newOrientation) | ||
2803 | { | ||
2804 | UpdateGroupRotationR(newOrientation); | ||
2805 | m_rootPart.SendTerseUpdateToAllClients(); | ||
2806 | } | ||
2807 | |||
2808 | /// <summary> | ||
2809 | /// Set the name of a prim | 2795 | /// Set the name of a prim |
2810 | /// </summary> | 2796 | /// </summary> |
2811 | /// <param name="name"></param> | 2797 | /// <param name="name"></param> |