diff options
author | Graham Linden <graham@lindenlab.com> | 2019-05-08 09:30:39 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 09:30:39 -0700 |
commit | 470d1595cc1c1c7c7ec3ab192e68622751423354 (patch) | |
tree | 079cd01cc1b247973f2e5fd589389cc8e0013b13 /indra/newview/lltool.cpp | |
parent | 06097302f4ad8786913e77514d5d60678da3160d (diff) | |
parent | 34322f8f37380df868703051230f2a4109602b3f (diff) |
Merge viewer-release
Diffstat (limited to 'indra/newview/lltool.cpp')
-rw-r--r-- | indra/newview/lltool.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp index 4aad650b68..b5d78f3654 100644 --- a/indra/newview/lltool.cpp +++ b/indra/newview/lltool.cpp @@ -191,7 +191,9 @@ LLTool* LLTool::getOverrideTool(MASK mask) { return NULL; } - if (gSavedSettings.getBOOL("EnableAltZoom")) + + static LLCachedControl<bool> alt_zoom(gSavedSettings, "EnableAltZoom", true); + if (alt_zoom) { if (mask & MASK_ALT) { |