diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-22 10:02:13 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-22 10:02:13 -0800 |
| commit | fa891c062ef66410123c66de1ef67b7dcef327db (patch) | |
| tree | d0badf37ffd261c6732744be03ab76cabf523c5e /indra/newview/lltoolpie.h | |
| parent | 84dfa02baf4aff336ec467acbe647618e9b4b21a (diff) | |
| parent | dc47f52e9f5ab095737fedf68d22c8228140c71b (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 5f0e28fa95..8a4c949aef 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -89,7 +89,9 @@ private: bool handleMediaClick(const LLPickInfo& info); bool handleMediaHover(const LLPickInfo& info); - bool handleMediaMouseUp(); + bool handleMediaMouseUp(); + BOOL handleTooltipLand(std::string line, std::string tooltip_msg); + BOOL handleTooltipObject( LLViewerObject* hover_object, std::string line, std::string tooltip_msg); private: BOOL mGrabMouseButtonDown; |