diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-03-23 22:39:18 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-03-23 22:39:18 -0400 |
| commit | d6f7a16a686a32a3369661b8db35860e7cae6e8f (patch) | |
| tree | 07b0117b098fef20dd9ddc597e4c0599c4235a4d /indra/llcharacter/llcharacter.h | |
| parent | 7ba82a6409e4fc096407f0247b084950d1e3c14a (diff) | |
| parent | c489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff) | |
merge changes for 3.7.26-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 |