Thank you M1sha for diagnosing and patching a lock bug affecting region crossings introduced in r9110. Fixes mantis #3456.

0.6.5-rc1
diva 2009-04-17 23:55:59 +00:00
parent 68190617b4
commit 722be8f132
1 changed files with 16 additions and 13 deletions

View File

@ -1948,6 +1948,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
//m_log.DebugFormat("Updating movement animation to {0}", anim); //m_log.DebugFormat("Updating movement animation to {0}", anim);
if (!m_isChildAgent)
{
if (m_animations.TrySetDefaultAnimation(anim, m_controllingClient.NextAnimationSequenceNumber, UUID.Zero)) if (m_animations.TrySetDefaultAnimation(anim, m_controllingClient.NextAnimationSequenceNumber, UUID.Zero))
{ {
if (m_scriptEngines != null) if (m_scriptEngines != null)
@ -1965,7 +1967,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m == null) // No script engine loaded if (m == null) // No script engine loaded
continue; continue;
m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] {16384}); m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { 16384 });
} }
} }
} }
@ -1973,6 +1975,7 @@ namespace OpenSim.Region.Framework.Scenes
SendAnimPack(); SendAnimPack();
} }
} }
}
/// <summary> /// <summary>
/// This method determines the proper movement related animation /// This method determines the proper movement related animation