diff options
| author | angela <angela@lindenlab.com> | 2010-01-20 11:20:37 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-01-20 11:20:37 +0800 |
| commit | 41f2b8e6017c4846430f501dc3d4877b505b9fbd (patch) | |
| tree | 1ea21dc29ec12cd27696eecae1fb427f84ee3f78 /indra/newview/lltoolpie.h | |
| parent | 1e9436c3a464392d4a338ab8b9f4ad8e7aa715ba (diff) | |
| parent | 9c0ce03d820a13aa771111ed51759752e2306836 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey/
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; |