diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-03-23 12:43:44 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-03-23 12:43:44 -0700 |
| commit | 760941d504d1dc6d423b7246a0ea1d1d73aed4a5 (patch) | |
| tree | ff88cd57bb03cf38fb7fef121647b1951ede1aaa /indra/llcharacter/llcharacter.h | |
| parent | bdb9a769f12754dadf324b3dd395c1ca1519f938 (diff) | |
| parent | c489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llcharacter/llcharacter.h')
| -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 |