aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAliciaRaven2015-04-17 23:09:14 +0100
committerBlueWall2015-04-17 19:37:18 -0500
commit28ce3238020c4dca8f9aef711daf730bccf0d2f0 (patch)
treeafed9f4da8775eda46ad6bcdf0625fae2530d3cb /OpenSim/Region
parentSmall fix for ini comments (diff)
downloadopensim-SC-28ce3238020c4dca8f9aef711daf730bccf0d2f0.zip
opensim-SC-28ce3238020c4dca8f9aef711daf730bccf0d2f0.tar.gz
opensim-SC-28ce3238020c4dca8f9aef711daf730bccf0d2f0.tar.bz2
opensim-SC-28ce3238020c4dca8f9aef711daf730bccf0d2f0.tar.xz
Enable grab feature (Ctrl+Drag) for non-physical link-sets and add code to handle spin (Ctrl+Shift+Drag)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs22
1 files changed, 18 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 0a1a226..9e5314d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2672,16 +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>
2685 public void NonPhysicalGrabMovement(Vector3 pos) 2689 public void NonPhysicalGrabMovement(Vector3 pos)
2686 { 2690 {
2687 AbsolutePosition = pos; 2691 AbsolutePosition = pos;
@@ -2781,17 +2785,27 @@ namespace OpenSim.Region.Framework.Scenes
2781 } 2785 }
2782 else 2786 else
2783 { 2787 {
2784 //NonPhysicalSpinMovement(pos); 2788 NonPhysicalSpinMovement(newOrientation);
2785 } 2789 }
2786 } 2790 }
2787 else 2791 else
2788 { 2792 {
2789 //NonPhysicalSpinMovement(pos); 2793 NonPhysicalSpinMovement(newOrientation);
2790 } 2794 }
2791 } 2795 }
2792 } 2796 }
2793 2797
2794 /// <summary> 2798 /// <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>
2795 /// Set the name of a prim 2809 /// Set the name of a prim
2796 /// </summary> 2810 /// </summary>
2797 /// <param name="name"></param> 2811 /// <param name="name"></param>