aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-28 03:25:02 +0000
committerTeravus Ovares2008-01-28 03:25:02 +0000
commit5e36feada2a109ef01944eee4ed34fefdacf36a5 (patch)
tree8bf8f5216d1d3f49a0b8ea078ac281e9423ab243 /OpenSim/Region/Environment/Scenes
parent* Highly experimental ODE_STEPSIZE = 0.025f - 1000 / 25 = 40fps - 10 substeps... (diff)
downloadopensim-SC_OLD-5e36feada2a109ef01944eee4ed34fefdacf36a5.zip
opensim-SC_OLD-5e36feada2a109ef01944eee4ed34fefdacf36a5.tar.gz
opensim-SC_OLD-5e36feada2a109ef01944eee4ed34fefdacf36a5.tar.bz2
opensim-SC_OLD-5e36feada2a109ef01944eee4ed34fefdacf36a5.tar.xz
* Mostly ODE update. Things are a bit more behaved then the last experimental update.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index de3380a..75ccf1a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -812,7 +812,10 @@ namespace OpenSim.Region.Environment.Scenes
812 } 812 }
813 813
814 if (m_physicsActor == null) 814 if (m_physicsActor == null)
815 {
815 AddToPhysicalScene(); 816 AddToPhysicalScene();
817
818 }
816 819
817 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); 820 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
818 m_parentPosition = new LLVector3(); 821 m_parentPosition = new LLVector3();
@@ -820,6 +823,12 @@ namespace OpenSim.Region.Environment.Scenes
820 823
821 m_parentID = 0; 824 m_parentID = 0;
822 SendFullUpdateToAllClients(); 825 SendFullUpdateToAllClients();
826
827 if (m_physicsActor != null)
828 {
829 SetHeight(m_avHeight);
830
831 }
823 } 832 }
824 833
825 SetMovementAnimation(Animations.AnimsLLUUID["STAND"], 1); 834 SetMovementAnimation(Animations.AnimsLLUUID["STAND"], 1);