From 7d699514a5559e2a7670a2259067cd8dd29c011c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 19 Apr 2015 20:22:55 -0700
Subject: 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.
---
.../Region/Framework/Scenes/SceneObjectGroup.cs | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
(limited to 'OpenSim')
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
}
else
{
- NonPhysicalGrabMovement(pos);
+ //NonPhysicalGrabMovement(pos);
}
}
else
{
- NonPhysicalGrabMovement(pos);
+ //NonPhysicalGrabMovement(pos);
}
}
}
- /// <summary>
- /// Apply possition for grabbing non-physical linksets (ctrl+drag)
- /// </summary>
- /// <param name="pos">New Position</param>
public void NonPhysicalGrabMovement(Vector3 pos)
{
AbsolutePosition = pos;
@@ -2785,27 +2781,17 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
- NonPhysicalSpinMovement(newOrientation);
+ //NonPhysicalSpinMovement(pos);
}
}
else
{
- NonPhysicalSpinMovement(newOrientation);
+ //NonPhysicalSpinMovement(pos);
}
}
}
/// <summary>
- /// Apply rotation for spinning non-physical linksets (ctrl+shift+drag)
- /// </summary>
- /// <param name="newOrientation">New Rotation</param>
- private void NonPhysicalSpinMovement(Quaternion newOrientation)
- {
- UpdateGroupRotationR(newOrientation);
- m_rootPart.SendTerseUpdateToAllClients();
- }
-
- /// <summary>
/// Set the name of a prim
/// </summary>
/// <param name="name"></param>
--
cgit v1.1