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)" 

We found that linksets can move if the root prim is unscripted. Will revert this until a fix can be implemented.
inv-download
BlueWall 2015-04-28 17:24:54 -05:00
parent 38459104eb
commit e171ae899d
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2672,26 +2672,20 @@ 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)
{ {
if((m_rootPart.Flags & PrimFlags.Scripted) == 0) AbsolutePosition = pos;
{ m_rootPart.SendTerseUpdateToAllClients();
UpdateGroupPosition(pos);
}
} }
/// <summary> /// <summary>
@ -2787,28 +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)
{
if ((m_rootPart.Flags & PrimFlags.Scripted) == 0)
{
UpdateGroupRotationR(newOrientation);
}
}
/// <summary> /// <summary>
/// Set the name of a prim /// Set the name of a prim
/// </summary> /// </summary>