diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-01 14:01:00 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-01 14:01:00 -0700 |
| commit | c179c687db4caba0d88a7be9e04c47d7f0e1952a (patch) | |
| tree | d0819729d56d5221bb4829f8bf36c9e343ba74c5 /indra/llui | |
| parent | 8e1a9e2813da6b9d5c17795b375098fb6a386ee1 (diff) | |
| parent | d54eded93ba270402349f5f337bbe12339255ece (diff) | |
merging in latest changes
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llview.cpp | 11 | ||||
| -rw-r--r-- | indra/llui/llview.h | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 5c2b3236f6..8323bfc12f 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -873,13 +873,12 @@ BOOL LLView::handleToolTip(S32 x, S32 y, MASK mask) // 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" ); + ? LLUI::sSettingGroups["config"]->getF32( "ToolTipFastDelay" ) + : LLUI::sSettingGroups["config"]->getF32( "ToolTipDelay" ); LLToolTipMgr::instance().show(LLToolTip::Params() - .message(tooltip) - .sticky_rect(calcScreenRect()) - .delay_time(timeout)); - + .message(tooltip) + .sticky_rect(calcScreenRect()) + .delay_time(timeout)); handled = TRUE; } diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 1c35349510..15b85a6418 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -67,7 +67,6 @@ const BOOL NOT_MOUSE_OPAQUE = FALSE; const U32 GL_NAME_UI_RESERVED = 2; - // maintains render state during traversal of UI tree class LLViewDrawContext { |