diff options
| author | simon <none@none> | 2015-04-14 10:46:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-04-14 10:46:45 -0700 |
| commit | 99c5f36f204759af1a81268be0bc72dd69789de4 (patch) | |
| tree | 4c2449aa915f1b538788f69bf540f028847a334a /indra/newview/llvoavatarself.h | |
| parent | 00f18efe75cdf5d70b2f7f66ce702fc3bd25dd5d (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge viewer-release, become version 3.7.28
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 5f36872575..b8e9bbb77a 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); @@ -328,6 +331,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 ** ** *******************************************************************************/ |