diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-23 11:36:00 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-23 11:36:00 -0700 |
commit | 3ad81bb4a642d25018b773d2ef005380664d8170 (patch) | |
tree | b1bbf66c0babf6c541858b34d4a7f66ad19308b0 /indra/newview/llvoavatar.h | |
parent | a2c659378b8b7c8a4128c61b5cde91eccc9db4e6 (diff) | |
parent | 62a958d341532287519a23a362ff7aebd501e1c9 (diff) |
Merge
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 1152475383..7209b9f1e5 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -292,13 +292,14 @@ protected: public:
void updateHeadOffset();
F32 getPelvisToFoot() const { return mPelvisToFoot; }
- void setPelvisOffset( bool hasOffset, const LLVector3& translation ) ;
+ void setPelvisOffset( bool hasOffset, const LLVector3& translation, F32 offset ) ;
bool hasPelvisOffset( void ) { return mHasPelvisOffset; }
void postPelvisSetRecalc( void );
bool mHasPelvisOffset;
LLVector3 mPelvisOffset;
F32 mLastPelvisToFoot;
+ F32 mPelvisFixup;
LLVector3 mHeadOffset; // current head position
LLViewerJoint mRoot;
|