diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
| commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
| tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/llcharacter/llmotioncontroller.h | |
| parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) | |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llcharacter/llmotioncontroller.h')
| -rw-r--r-- | indra/llcharacter/llmotioncontroller.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h index 15791b6318..19bab09a11 100644 --- a/indra/llcharacter/llmotioncontroller.h +++ b/indra/llcharacter/llmotioncontroller.h @@ -162,7 +162,7 @@ protected: void deleteAllMotions(); void addLoadedMotion(LLMotion *motion); BOOL activateMotion(LLMotion *motion, F32 time); - BOOL deactivateMotion(LLMotion *motion); + BOOL deactivateMotion(LLMotion *motion, bool remove_weight); void updateRegularMotions(); void updateAdditiveMotions(); void resetJointSignatures(); |