aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-11-03 00:48:18 +0000
committerMelanie2010-11-03 00:48:18 +0000
commite9ec1877461c4d488a3e687c76b021841006dc38 (patch)
tree0a7546792129ec3b2042dacf903ab2354cd9781c
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentActually calculate the height before setting it, this isn't done automatically (diff)
downloadopensim-SC_OLD-e9ec1877461c4d488a3e687c76b021841006dc38.zip
opensim-SC_OLD-e9ec1877461c4d488a3e687c76b021841006dc38.tar.gz
opensim-SC_OLD-e9ec1877461c4d488a3e687c76b021841006dc38.tar.bz2
opensim-SC_OLD-e9ec1877461c4d488a3e687c76b021841006dc38.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c900fe1..3866647 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3428,6 +3428,12 @@ namespace OpenSim.Region.Framework.Scenes
3428 m_setAlwaysRun = cAgent.AlwaysRun; 3428 m_setAlwaysRun = cAgent.AlwaysRun;
3429 3429
3430 m_appearance = new AvatarAppearance(cAgent.Appearance); 3430 m_appearance = new AvatarAppearance(cAgent.Appearance);
3431 if (m_physicsActor != null)
3432 {
3433 bool isFlying = m_physicsActor.Flying;
3434 RemoveFromPhysicalScene();
3435 AddToPhysicalScene(isFlying);
3436 }
3431 3437
3432/* 3438/*
3433 uint i = 0; 3439 uint i = 0;
@@ -3566,6 +3572,9 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju
3566 /// </summary> 3572 /// </summary>
3567 public void AddToPhysicalScene(bool isFlying) 3573 public void AddToPhysicalScene(bool isFlying)
3568 { 3574 {
3575 if (m_appearance.AvatarHeight == 0)
3576 m_appearance.SetHeight();
3577
3569 PhysicsScene scene = m_scene.PhysicsScene; 3578 PhysicsScene scene = m_scene.PhysicsScene;
3570 3579
3571 Vector3 pVec = AbsolutePosition; 3580 Vector3 pVec = AbsolutePosition;