diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
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 | ||