diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-03 09:47:57 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-03 09:47:57 -0400 |
| commit | c641fb08ae349b185401ec0084f9cc0b9ebabdb9 (patch) | |
| tree | fd4dc5e6d626b67ebe2fb94ceae7e5df03b5d6f8 /indra/llcharacter | |
| parent | 2be928bd9915b871f98a81ca52a9a952c0bf3562 (diff) | |
| parent | d06ac0b7ba3ceb912ff8cf04da063eb482050d2b (diff) | |
merge
Diffstat (limited to 'indra/llcharacter')
| -rwxr-xr-x | indra/llcharacter/llcharacter.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h index d4e3b76386..1a3e307663 100755 --- a/indra/llcharacter/llcharacter.h +++ b/indra/llcharacter/llcharacter.h @@ -261,6 +261,9 @@ public: static std::vector< LLCharacter* > sInstances; static BOOL sAllowInstancesChange ; //debug use + virtual void setHoverOffset(const LLVector3& hover_offset, bool send_update=true) { mHoverOffset = hover_offset; } + const LLVector3& getHoverOffset() const { return mHoverOffset; } + protected: LLMotionController mMotionController; @@ -273,7 +276,6 @@ protected: U32 mSkeletonSerialNum; LLAnimPauseRequest mPauseRequest; - private: // visual parameter stuff typedef std::map<S32, LLVisualParam *> visual_param_index_map_t; @@ -284,6 +286,8 @@ private: visual_param_name_map_t mVisualParamNameMap; static LLStringTable sVisualParamNames; + + LLVector3 mHoverOffset; }; #endif // LL_LLCHARACTER_H |