From 9406db3047a864e3c98221d6edb66e508d404e9d Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 2 Apr 2014 21:52:24 -0700
Subject: Fix problem with floating avatar by passing avatar size information
 to the physics engine.

This operation was accidentally removed while in the middle of improving
the computation of the avatar height. This is a temp fix until the real
solution is added.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3e5b6bf..a0b4019 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1579,9 +1579,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetSize(Vector3 size, float feetoffset)
         {
-// TODO: Merge the physics bits
-//            if (PhysicsActor != null && !IsChildAgent)
-//                PhysicsActor.setAvatarSize(size, feetoffset);
+            if (PhysicsActor != null && !IsChildAgent)
+            {
+                // Eventually there will be a physics call that sets avatar size that includes offset info.
+                // For the moment, just set the size as passed.
+                PhysicsActor.Size = size;
+                //  PhysicsActor.setAvatarSize(size, feetoffset);
+            }
             
         }
 
-- 
cgit v1.1