diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-25 14:51:29 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-25 14:51:29 -0400 |
| commit | 534ac19ed5a6abe68ea654a5444b7e486f8ce06a (patch) | |
| tree | 7f50cfebe34b2c5853a6af93e8992bf2909d0ba4 /indra/newview/llvoavatar.cpp | |
| parent | 9f2987d995e8a2273f723a387dd587c3dc988056 (diff) | |
| parent | 44774cd265306c6d29f0a63c0876c7fa7b84311e (diff) | |
merge from mesh-development to nyx-mesh-development
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 1b10d9f1c3..77bddaacf0 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1333,7 +1333,17 @@ const LLVector3 LLVOAvatar::getRenderPosition() const } else if (isRoot()) { - return mDrawable->getPositionAgent(); + if ( !mHasPelvisOffset ) + { + return mDrawable->getPositionAgent(); + } + else + { + //Apply a pelvis fixup (as defined by the avs skin) + LLVector3 pos = mDrawable->getPositionAgent(); + pos[VZ] += mPelvisFixup; + return pos; + } } else { @@ -3813,6 +3823,14 @@ void LLVOAvatar::postPelvisSetRecalc( void ) updateHeadOffset(); } //------------------------------------------------------------------------ +// pelisPoke +//------------------------------------------------------------------------ +void LLVOAvatar::setPelvisOffset( F32 pelvisFixupAmount ) +{ + mHasPelvisOffset = true; + mPelvisFixup = pelvisFixupAmount; +} +//------------------------------------------------------------------------ // updateVisibility() //------------------------------------------------------------------------ void LLVOAvatar::updateVisibility() |