diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-28 17:30:18 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-28 17:30:18 -0700 |
| commit | 7fc33cc47fdc080bbc7674cf118011b689ba1485 (patch) | |
| tree | 5c5a74d7cfd06c23ee97ede9ad65011701624746 /indra/llui | |
| parent | 166ff2b1b8dc21ad1a88c715a480ce1d2c5c2e07 (diff) | |
CHUI-367 : Completed : Show user name tooltip in all situations so to avoid the conversation name showing up
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llview.cpp | 21 | ||||
| -rw-r--r-- | indra/llui/llview.h | 2 |
2 files changed, 9 insertions, 14 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 49e7eaef99..8323bfc12f 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -870,18 +870,15 @@ BOOL LLView::handleToolTip(S32 x, S32 y, MASK mask) std::string tooltip = getToolTip(); if (!tooltip.empty()) { - if (tooltip != NO_TOOLTIP_STRING) - { - // allow "scrubbing" over ui by showing next tooltip immediately - // if previous one was still visible - F32 timeout = LLToolTipMgr::instance().toolTipVisible() - ? LLUI::sSettingGroups["config"]->getF32( "ToolTipFastDelay" ) - : LLUI::sSettingGroups["config"]->getF32( "ToolTipDelay" ); - LLToolTipMgr::instance().show(LLToolTip::Params() - .message(tooltip) - .sticky_rect(calcScreenRect()) - .delay_time(timeout)); - } + // allow "scrubbing" over ui by showing next tooltip immediately + // if previous one was still visible + F32 timeout = LLToolTipMgr::instance().toolTipVisible() + ? LLUI::sSettingGroups["config"]->getF32( "ToolTipFastDelay" ) + : LLUI::sSettingGroups["config"]->getF32( "ToolTipDelay" ); + LLToolTipMgr::instance().show(LLToolTip::Params() + .message(tooltip) + .sticky_rect(calcScreenRect()) + .delay_time(timeout)); handled = TRUE; } diff --git a/indra/llui/llview.h b/indra/llui/llview.h index ba896b65a4..15b85a6418 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -67,8 +67,6 @@ const BOOL NOT_MOUSE_OPAQUE = FALSE; const U32 GL_NAME_UI_RESERVED = 2; -static const std::string NO_TOOLTIP_STRING = " "; - // maintains render state during traversal of UI tree class LLViewDrawContext { |