aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-11-02 18:00:07 -0700
committeropensim mirror account2010-11-02 18:00:07 -0700
commit87d56ec6adaf973e7fc1633e3762cc5aa4f73630 (patch)
treed006a36676f9a9646b6531dfe5868bbddb6ac9b2
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentTrying to prevent a wrong physical actor size (diff)
downloadopensim-SC_OLD-87d56ec6adaf973e7fc1633e3762cc5aa4f73630.zip
opensim-SC_OLD-87d56ec6adaf973e7fc1633e3762cc5aa4f73630.tar.gz
opensim-SC_OLD-87d56ec6adaf973e7fc1633e3762cc5aa4f73630.tar.bz2
opensim-SC_OLD-87d56ec6adaf973e7fc1633e3762cc5aa4f73630.tar.xz
Merge branch 'master' of /var/git/opensim/
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ce9cf0c..a339a4f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3187,6 +3187,9 @@ namespace OpenSim.Region.Framework.Scenes
3187 /// </summary> 3187 /// </summary>
3188 public void AddToPhysicalScene(bool isFlying) 3188 public void AddToPhysicalScene(bool isFlying)
3189 { 3189 {
3190 if (m_appearance.AvatarHeight == 0)
3191 return;
3192
3190 PhysicsScene scene = m_scene.PhysicsScene; 3193 PhysicsScene scene = m_scene.PhysicsScene;
3191 3194
3192 Vector3 pVec = AbsolutePosition; 3195 Vector3 pVec = AbsolutePosition;