Attempt to catch animation fubar on region crossing that causes client hang. Mantis 319.
parent
c3594ba7d1
commit
288c4f4a44
|
@ -1009,6 +1009,8 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
/// like flying and sitting, for example.
|
/// like flying and sitting, for example.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected void SetMovementAnimation(LLUUID anim, int seq)
|
protected void SetMovementAnimation(LLUUID anim, int seq)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (m_animations[0] != anim)
|
if (m_animations[0] != anim)
|
||||||
{
|
{
|
||||||
|
@ -1017,6 +1019,14 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
SendAnimPack();
|
SendAnimPack();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
MainLog.Instance.Warn("AVATAR", "SetMovementAnimation for avatar failed. Attempting recovery...");
|
||||||
|
m_animations[0] = anim;
|
||||||
|
m_animationSeqs[0] = seq;
|
||||||
|
SendAnimPack();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This method handles agent movement related animations
|
/// This method handles agent movement related animations
|
||||||
|
|
Loading…
Reference in New Issue