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

cancel MoveToTarget (viewer 'go here") on sits

avinationmerge
UbitUmarov 2013-01-03 02:25:27 +00:00
parent a504704071
commit d40cdd2649
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2140,12 +2140,21 @@ namespace OpenSim.Region.Framework.Scenes
if (canSit) if (canSit)
{ {
if (PhysicsActor != null) if (PhysicsActor != null)
{ {
// We can remove the physicsActor until they stand up. // We can remove the physicsActor until they stand up.
RemoveFromPhysicalScene(); RemoveFromPhysicalScene();
} }
if (MovingToTarget)
{
ResetMoveToTarget();
m_forceToApply = null;
}
Velocity = Vector3.Zero;
part.AddSittingAvatar(UUID); part.AddSittingAvatar(UUID);
cameraAtOffset = part.GetCameraAtOffset(); cameraAtOffset = part.GetCameraAtOffset();
@ -2230,6 +2239,7 @@ namespace OpenSim.Region.Framework.Scenes
return true; return true;
} }
// not doing autopilot // not doing autopilot
m_requestedSitTargetID = 0; m_requestedSitTargetID = 0;
@ -2259,8 +2269,19 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.InfoFormat("physsit {0} {1}", offset.ToString(),Orientation.ToString()); // m_log.InfoFormat("physsit {0} {1}", offset.ToString(),Orientation.ToString());
RemoveFromPhysicalScene();
if (MovingToTarget)
{
ResetMoveToTarget();
m_forceToApply = null;
}
Velocity = Vector3.Zero;
part.AddSittingAvatar(UUID); part.AddSittingAvatar(UUID);
Vector3 cameraAtOffset = part.GetCameraAtOffset(); Vector3 cameraAtOffset = part.GetCameraAtOffset();
Vector3 cameraEyeOffset = part.GetCameraEyeOffset(); Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
bool forceMouselook = part.GetForceMouselook(); bool forceMouselook = part.GetForceMouselook();
@ -2269,8 +2290,6 @@ namespace OpenSim.Region.Framework.Scenes
part.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); part.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
// not using autopilot // not using autopilot
Velocity = Vector3.Zero;
RemoveFromPhysicalScene();
Rotation = Orientation; Rotation = Orientation;
m_pos = offset; m_pos = offset;
@ -2317,6 +2336,7 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
} }
if (part.SitTargetAvatar == UUID) if (part.SitTargetAvatar == UUID)
{ {
Vector3 sitTargetPos = part.SitTargetPosition; Vector3 sitTargetPos = part.SitTargetPosition;