aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-11-03 00:47:22 +0000
committerMelanie2010-11-03 00:47:22 +0000
commit57eabe9d4625a7f91a48525f83233a5a617c5a24 (patch)
tree37e157e30474dd0f7059c356101a06984204cef3 /OpenSim
parentTrying to prevent a wrong physical actor size (diff)
downloadopensim-SC-57eabe9d4625a7f91a48525f83233a5a617c5a24.zip
opensim-SC-57eabe9d4625a7f91a48525f83233a5a617c5a24.tar.gz
opensim-SC-57eabe9d4625a7f91a48525f83233a5a617c5a24.tar.bz2
opensim-SC-57eabe9d4625a7f91a48525f83233a5a617c5a24.tar.xz
Actually calculate the height before setting it, this isn't done automatically
on incoming transfers in all cases.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a339a4f..964f8cb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3078,6 +3078,12 @@ namespace OpenSim.Region.Framework.Scenes
3078 m_setAlwaysRun = cAgent.AlwaysRun; 3078 m_setAlwaysRun = cAgent.AlwaysRun;
3079 3079
3080 m_appearance = new AvatarAppearance(cAgent.Appearance); 3080 m_appearance = new AvatarAppearance(cAgent.Appearance);
3081 if (m_physicsActor != null)
3082 {
3083 bool isFlying = m_physicsActor.Flying;
3084 RemoveFromPhysicalScene();
3085 AddToPhysicalScene(isFlying);
3086 }
3081 3087
3082/* 3088/*
3083 uint i = 0; 3089 uint i = 0;
@@ -3188,7 +3194,7 @@ namespace OpenSim.Region.Framework.Scenes
3188 public void AddToPhysicalScene(bool isFlying) 3194 public void AddToPhysicalScene(bool isFlying)
3189 { 3195 {
3190 if (m_appearance.AvatarHeight == 0) 3196 if (m_appearance.AvatarHeight == 0)
3191 return; 3197 m_appearance.SetHeight();
3192 3198
3193 PhysicsScene scene = m_scene.PhysicsScene; 3199 PhysicsScene scene = m_scene.PhysicsScene;
3194 3200