diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-12 17:39:08 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-12 17:39:08 -0500 |
commit | 93696ac019865898d35d37d1e32d7a4b819a0c93 (patch) | |
tree | afac704c0d5ad56c0bc2ed603e6f0bb15f525431 /indra/newview/llvoavatarself.h | |
parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
parent | 4911586023144bd10d6a91f3f1be1e65af0c706d (diff) |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.h')
-rw-r--r-- | indra/newview/llvoavatarself.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index d13cf5ba38..51f06dee5f 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -83,7 +83,9 @@ public: /*virtual*/ void stopMotionFromSource(const LLUUID& source_id); /*virtual*/ void requestStopMotion(LLMotion* motion); /*virtual*/ LLJoint* getJoint(const std::string &name); - + + void resetJointPositions( void ); + /*virtual*/ BOOL setVisualParamWeight(LLVisualParam *which_param, F32 weight, BOOL upload_bake = FALSE ); /*virtual*/ BOOL setVisualParamWeight(const char* param_name, F32 weight, BOOL upload_bake = FALSE ); /*virtual*/ BOOL setVisualParamWeight(S32 index, F32 weight, BOOL upload_bake = FALSE ); |