diff options
author | BlueWall | 2015-04-28 17:24:54 -0500 |
---|---|---|
committer | BlueWall | 2015-04-28 17:24:54 -0500 |
commit | e171ae899d3b78072f368de357dadeeae8808f8d (patch) | |
tree | c34ab840d313070ca80bcb22c86d12672167eb94 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Revert "Revert "Fix the click to buy prim dialog not being displayed with alp... (diff) | |
download | opensim-SC_OLD-e171ae899d3b78072f368de357dadeeae8808f8d.zip opensim-SC_OLD-e171ae899d3b78072f368de357dadeeae8808f8d.tar.gz opensim-SC_OLD-e171ae899d3b78072f368de357dadeeae8808f8d.tar.bz2 opensim-SC_OLD-e171ae899d3b78072f368de357dadeeae8808f8d.tar.xz |
Revert "Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)"
We found that linksets can move if the root prim is unscripted. Will revert this until a fix can be implemented.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 75da299..0a1a226 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2672,26 +2672,20 @@ 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 | if((m_rootPart.Flags & PrimFlags.Scripted) == 0) | 2687 | AbsolutePosition = pos; |
2692 | { | 2688 | m_rootPart.SendTerseUpdateToAllClients(); |
2693 | UpdateGroupPosition(pos); | ||
2694 | } | ||
2695 | } | 2689 | } |
2696 | 2690 | ||
2697 | /// <summary> | 2691 | /// <summary> |
@@ -2787,29 +2781,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
2787 | } | 2781 | } |
2788 | else | 2782 | else |
2789 | { | 2783 | { |
2790 | NonPhysicalSpinMovement(newOrientation); | 2784 | //NonPhysicalSpinMovement(pos); |
2791 | } | 2785 | } |
2792 | } | 2786 | } |
2793 | else | 2787 | else |
2794 | { | 2788 | { |
2795 | NonPhysicalSpinMovement(newOrientation); | 2789 | //NonPhysicalSpinMovement(pos); |
2796 | } | 2790 | } |
2797 | } | 2791 | } |
2798 | } | 2792 | } |
2799 | 2793 | ||
2800 | /// <summary> | 2794 | /// <summary> |
2801 | /// Apply rotation for spinning non-physical linksets (ctrl+shift+drag) | ||
2802 | /// </summary> | ||
2803 | /// <param name="newOrientation">New Rotation</param> | ||
2804 | private void NonPhysicalSpinMovement(Quaternion newOrientation) | ||
2805 | { | ||
2806 | if ((m_rootPart.Flags & PrimFlags.Scripted) == 0) | ||
2807 | { | ||
2808 | UpdateGroupRotationR(newOrientation); | ||
2809 | } | ||
2810 | } | ||
2811 | |||
2812 | /// <summary> | ||
2813 | /// Set the name of a prim | 2795 | /// Set the name of a prim |
2814 | /// </summary> | 2796 | /// </summary> |
2815 | /// <param name="name"></param> | 2797 | /// <param name="name"></param> |