Reorder checks in SP.CompleteMovement() to fix test failures
parent
f467121c51
commit
4fa843ff19
|
@ -1003,6 +1003,13 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
/// </remarks>
|
||||
private bool MakeRootAgent(Vector3 pos, bool isFlying)
|
||||
{
|
||||
lock (m_completeMovementLock)
|
||||
{
|
||||
if (!IsChildAgent)
|
||||
return false;
|
||||
|
||||
//m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
|
||||
|
||||
// m_log.InfoFormat(
|
||||
// "[SCENE]: Upgrading child to root agent for {0} in {1}",
|
||||
// Name, m_scene.RegionInfo.RegionName);
|
||||
|
@ -1029,23 +1036,13 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
ParentUUID = UUID.Zero;
|
||||
|
||||
IsChildAgent = false;
|
||||
|
||||
// Animator.TrySetMovementAnimation("SIT");
|
||||
}
|
||||
else
|
||||
{
|
||||
IsChildAgent = false;
|
||||
IsLoggingIn = false;
|
||||
}
|
||||
|
||||
//m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
|
||||
|
||||
lock (m_completeMovementLock)
|
||||
{
|
||||
if (!IsChildAgent)
|
||||
return false;
|
||||
|
||||
IsChildAgent = false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue