diff options
author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/llui/lltooltip.h | |
parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) |
merge changes for 3.4.5
Diffstat (limited to 'indra/llui/lltooltip.h')
-rw-r--r-- | indra/llui/lltooltip.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h index d71a944c3d..fad127fc4c 100644 --- a/indra/llui/lltooltip.h +++ b/indra/llui/lltooltip.h @@ -105,6 +105,8 @@ public: LLToolTip(const Params& p); void initFromParams(const LLToolTip::Params& params); + void getToolTipMessage(std::string & message); + private: class LLTextBox* mTextBox; class LLButton* mInfoButton; @@ -142,6 +144,8 @@ public: LLRect getMouseNearRect(); void updateToolTipVisibility(); + void getToolTipMessage(std::string & message); + private: void createToolTip(const LLToolTip::Params& params); |