aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2014-04-02 21:52:24 -0700
committerRobert Adams2014-04-02 21:52:24 -0700
commit9406db3047a864e3c98221d6edb66e508d404e9d (patch)
treec4222dc8a78a704fda86726151ec97e6dedf6839 /OpenSim/Region
parentRemove redundant part.SitTargetAvatar setting from SP.MakeRootAgent as part.A... (diff)
downloadopensim-SC-9406db3047a864e3c98221d6edb66e508d404e9d.zip
opensim-SC-9406db3047a864e3c98221d6edb66e508d404e9d.tar.gz
opensim-SC-9406db3047a864e3c98221d6edb66e508d404e9d.tar.bz2
opensim-SC-9406db3047a864e3c98221d6edb66e508d404e9d.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 7 insertions, 3 deletions
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
1579 1579
1580 public void SetSize(Vector3 size, float feetoffset) 1580 public void SetSize(Vector3 size, float feetoffset)
1581 { 1581 {
1582// TODO: Merge the physics bits 1582 if (PhysicsActor != null && !IsChildAgent)
1583// if (PhysicsActor != null && !IsChildAgent) 1583 {
1584// PhysicsActor.setAvatarSize(size, feetoffset); 1584 // Eventually there will be a physics call that sets avatar size that includes offset info.
1585 // For the moment, just set the size as passed.
1586 PhysicsActor.Size = size;
1587 // PhysicsActor.setAvatarSize(size, feetoffset);
1588 }
1585 1589
1586 } 1590 }
1587 1591