Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-02 18:40:03 -07:00
commit 50a3bf6e14
1 changed files with 7 additions and 1 deletions

View File

@ -3078,6 +3078,12 @@ namespace OpenSim.Region.Framework.Scenes
m_setAlwaysRun = cAgent.AlwaysRun; m_setAlwaysRun = cAgent.AlwaysRun;
m_appearance = new AvatarAppearance(cAgent.Appearance); m_appearance = new AvatarAppearance(cAgent.Appearance);
if (m_physicsActor != null)
{
bool isFlying = m_physicsActor.Flying;
RemoveFromPhysicalScene();
AddToPhysicalScene(isFlying);
}
/* /*
uint i = 0; uint i = 0;
@ -3188,7 +3194,7 @@ namespace OpenSim.Region.Framework.Scenes
public void AddToPhysicalScene(bool isFlying) public void AddToPhysicalScene(bool isFlying)
{ {
if (m_appearance.AvatarHeight == 0) if (m_appearance.AvatarHeight == 0)
return; m_appearance.SetHeight();
PhysicsScene scene = m_scene.PhysicsScene; PhysicsScene scene = m_scene.PhysicsScene;