OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 28ce323802.
inv-download
Robert Adams 2015-04-19 20:22:55 -07:00
parent b4347cf214
commit 7d699514a5
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2672,20 +2672,16 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
NonPhysicalGrabMovement(pos); //NonPhysicalGrabMovement(pos);
} }
} }
else 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) public void NonPhysicalGrabMovement(Vector3 pos)
{ {
AbsolutePosition = pos; AbsolutePosition = pos;
@ -2785,26 +2781,16 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
NonPhysicalSpinMovement(newOrientation); //NonPhysicalSpinMovement(pos);
} }
} }
else 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> /// <summary>
/// Set the name of a prim /// Set the name of a prim
/// </summary> /// </summary>