diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-03-30 11:50:28 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-03-30 11:50:28 -0400 |
| commit | f0381cfc3e85a2caf5e5b26e08feef7b6c770bc6 (patch) | |
| tree | 6bea601ebd5ef0e5a13afe7c809d389092218ec6 /indra/newview/llvoavatarself.h | |
| parent | 81f9c81fe7caa8fceff4438a4c4b99f975c4f0de (diff) | |
| parent | c489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index c6a038f558..fab500c397 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -75,6 +75,9 @@ protected: // LLViewerObject interface and related //-------------------------------------------------------------------- public: + boost::signals2::connection mRegionChangedSlot; + + void onSimulatorFeaturesReceived(const LLUUID& region_id); /*virtual*/ void updateRegion(LLViewerRegion *regionp); /*virtual*/ void idleUpdate(LLAgent &agent, const F64 &time); @@ -321,6 +324,14 @@ public: public: bool sendAppearanceMessage(LLMessageSystem *mesgsys) const; + // -- care and feeding of hover height. + void setHoverIfRegionEnabled(); + void sendHoverHeight() const; + /*virtual*/ void setHoverOffset(const LLVector3& hover_offset, bool send_update=true); + +private: + mutable LLVector3 mLastHoverOffsetSent; + /** Appearance ** ** *******************************************************************************/ |