diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:31:44 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:31:44 -0600 |
| commit | aa322d8eb4341c213a19cef87a887114c1ca278b (patch) | |
| tree | 5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/newview/lltoolpie.cpp | |
| parent | 10f84d8244d01728338f1eb20b0b25271fc7db63 (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' v 6.4.22 into DRTVWR-541
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 322d0bc727..75a5fabdc2 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1234,7 +1234,8 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) { - if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("ShowHoverTips")) return TRUE; + static LLCachedControl<bool> show_hover_tips(*LLUI::getInstance()->mSettingGroups["config"], "ShowHoverTips", true); + if (!show_hover_tips) return TRUE; if (!mHoverPick.isValid()) return TRUE; LLViewerObject* hover_object = mHoverPick.getObject(); |