Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
3c91d0e00d
|
@ -212,8 +212,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
private Quaternion m_headrotation = Quaternion.Identity;
|
||||
|
||||
private string m_nextSitAnimation = String.Empty;
|
||||
|
||||
//PauPaw:Proper PID Controler for autopilot************
|
||||
public bool MovingToTarget { get; private set; }
|
||||
public Vector3 MoveToPositionTarget { get; private set; }
|
||||
|
@ -1955,25 +1953,10 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
StandUp();
|
||||
}
|
||||
|
||||
// if (!String.IsNullOrEmpty(sitAnimation))
|
||||
// {
|
||||
// m_nextSitAnimation = sitAnimation;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
m_nextSitAnimation = "SIT";
|
||||
// }
|
||||
|
||||
//SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
|
||||
SceneObjectPart part = FindNextAvailableSitTarget(targetID);
|
||||
|
||||
if (part != null)
|
||||
{
|
||||
if (!String.IsNullOrEmpty(part.SitAnimation))
|
||||
{
|
||||
m_nextSitAnimation = part.SitAnimation;
|
||||
}
|
||||
|
||||
m_requestedSitTargetID = part.LocalId;
|
||||
m_requestedSitTargetUUID = targetID;
|
||||
|
||||
|
@ -2187,18 +2170,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
*/
|
||||
|
||||
public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
|
||||
{
|
||||
if (!String.IsNullOrEmpty(m_nextSitAnimation))
|
||||
{
|
||||
HandleAgentSit(remoteClient, agentID, m_nextSitAnimation);
|
||||
}
|
||||
else
|
||||
{
|
||||
HandleAgentSit(remoteClient, agentID, "SIT");
|
||||
}
|
||||
}
|
||||
|
||||
public void HandleAgentSit(IClientAPI remoteClient, UUID agentID, string sitAnimation)
|
||||
{
|
||||
SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
|
||||
|
||||
|
@ -2247,6 +2218,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
Velocity = Vector3.Zero;
|
||||
RemoveFromPhysicalScene();
|
||||
|
||||
String sitAnimation = "SIT";
|
||||
if (!String.IsNullOrEmpty(part.SitAnimation))
|
||||
{
|
||||
sitAnimation = part.SitAnimation;
|
||||
}
|
||||
Animator.TrySetMovementAnimation(sitAnimation);
|
||||
SendAvatarDataToAllAgents();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue