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

More guards around SetHeight.

0.6.3-post-fixes
diva 2009-02-15 20:02:13 +00:00
parent 98e7ea015c
commit 312b0f91c4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1480,7 +1480,7 @@ namespace OpenSim.Region.Framework.Scenes
m_parentID = 0; m_parentID = 0;
SendFullUpdateToAllClients(); SendFullUpdateToAllClients();
m_requestedSitTargetID = 0; m_requestedSitTargetID = 0;
if (m_physicsActor != null) if ((m_physicsActor != null) && (m_avHeight > 0))
{ {
SetHeight(m_avHeight); SetHeight(m_avHeight);
} }
@ -2241,6 +2241,7 @@ namespace OpenSim.Region.Framework.Scenes
AddToPhysicalScene(m_physicsActor.Flying); AddToPhysicalScene(m_physicsActor.Flying);
} }
m_appearance.SetAppearance(texture, visualParam); m_appearance.SetAppearance(texture, visualParam);
if (m_appearance.AvatarHeight > 0)
SetHeight(m_appearance.AvatarHeight); SetHeight(m_appearance.AvatarHeight);
m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);