diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-08-12 13:46:25 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-08-12 13:46:25 -0400 |
| commit | 4961ee03c7af92754f853530a4d346ed84f721d1 (patch) | |
| tree | 0a422b619b264cf393a3f8d4f4e90f33a407e57c /indra/llcharacter/lljoint.h | |
| parent | 6128cd9f705ca5565cafbe4b969c767b138cd1f6 (diff) | |
| parent | 8abd6ed6b8c294ec6bfca59929dbcc71cd65c3a3 (diff) | |
merge
Diffstat (limited to 'indra/llcharacter/lljoint.h')
| -rwxr-xr-x | indra/llcharacter/lljoint.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 2b1e2005c6..a6a439a965 100755 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -84,6 +84,7 @@ protected: LLXformMatrix mDefaultXform; LLUUID mId; + public: U32 mDirtyFlags; BOOL mUpdateXform; @@ -160,7 +161,7 @@ public: // get/set local scale const LLVector3& getScale(); void setScale( const LLVector3& scale ); - + void storeScaleForReset( const LLVector3& scale ); // get/set world matrix const LLMatrix4 &getWorldMatrix(); void setWorldMatrix( const LLMatrix4& mat ); @@ -185,7 +186,6 @@ public: S32 getJointNum() const { return mJointNum; } void restoreOldXform( void ); - void restoreToDefaultXform( void ); void setDefaultFromCurrentXform( void ); void storeCurrentXform( const LLVector3& pos ); @@ -196,8 +196,8 @@ public: //If the old transform flag has been set, then the reset logic in avatar needs to be aware(test) of it const BOOL doesJointNeedToBeReset( void ) const { return mResetAfterRestoreOldXform; } - //Setter for joint reset flag - void setJointToBeReset( BOOL val ) { mResetAfterRestoreOldXform = val; } + void setJointResetFlag( bool val ) { mResetAfterRestoreOldXform = val; } + }; #endif // LL_LLJOINT_H |