OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving SendInitialData sort of back to where it was before, so that it doesn't interfere with the unit tests.

0.6.3-post-fixes
diva 2009-02-15 05:50:07 +00:00
parent 3d5a9e6748
commit 52c5b75174
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -845,7 +845,8 @@ namespace OpenSim.Region.Framework.Scenes
AbsolutePosition = pos; AbsolutePosition = pos;
AddToPhysicalScene(isFlying); AddToPhysicalScene(isFlying);
SetHeight(m_appearance.AvatarHeight); if (m_appearance != null)
SetHeight(m_appearance.AvatarHeight);
// Don't send an animation pack here, since on a region crossing this will sometimes cause a flying // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying
// avatar to return to the standing position in mid-air. On login it looks like this is being sent // avatar to return to the standing position in mid-air. On login it looks like this is being sent
@ -866,8 +867,6 @@ namespace OpenSim.Region.Framework.Scenes
m_isChildAgent = false; m_isChildAgent = false;
SendInitialData();
m_scene.EventManager.TriggerOnMakeRootAgent(this); m_scene.EventManager.TriggerOnMakeRootAgent(this);
} }
@ -1036,12 +1035,14 @@ namespace OpenSim.Region.Framework.Scenes
Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI); Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI);
m_callbackURI = null; m_callbackURI = null;
} }
//m_log.DebugFormat("Completed movement"); //m_log.DebugFormat("Completed movement");
} }
m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
SendInitialData();
} }
/// <summary> /// <summary>