tell viewers to autopilot on sit, but bypass it, so camera does get set
parent
0e1e247289
commit
0bd102a397
|
@ -3424,7 +3424,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
|
||||
ControllingClient.SendSitResponse(
|
||||
part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
|
||||
part.ParentGroup.UUID, offset, sitOrientation, true, cameraAtOffset, cameraEyeOffset, forceMouselook);
|
||||
|
||||
m_requestedSitTargetUUID = part.UUID;
|
||||
|
||||
|
@ -3432,8 +3432,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
// Moved here to avoid a race with default sit anim
|
||||
// The script event needs to be raised after the default sit anim is set.
|
||||
part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
|
||||
m_scene.EventManager.TriggerParcelPrimCountTainted(); // update select/ sat on
|
||||
//part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
|
||||
//m_scene.EventManager.TriggerParcelPrimCountTainted(); // update select/ sat on
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3572,7 +3572,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
m_pos = offset;
|
||||
|
||||
ControllingClient.SendSitResponse(
|
||||
part.ParentGroup.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
|
||||
part.ParentGroup.UUID, offset, Orientation, true, cameraAtOffset, cameraEyeOffset, forceMouselook);
|
||||
|
||||
SendAvatarDataToAllAgents();
|
||||
|
||||
|
@ -3591,7 +3591,10 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
if (IsChildAgent)
|
||||
return;
|
||||
|
||||
SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
|
||||
if(SitGround || IsSatOnObject)
|
||||
return;
|
||||
|
||||
SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
|
||||
|
||||
if (part != null)
|
||||
{
|
||||
|
@ -3735,7 +3738,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
// Animator.TrySetMovementAnimation(sitAnimation);
|
||||
Animator.SetMovementAnimations("SIT");
|
||||
TriggerScenePresenceUpdated();
|
||||
// TriggerScenePresenceUpdated();
|
||||
part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
|
||||
m_scene.EventManager.TriggerParcelPrimCountTainted(); // update select/ sat on
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue