diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 21:42:32 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 21:42:32 +0300 |
commit | 28ddde936d1a43f6d702504f868ec3cc7ec4f60e (patch) | |
tree | ccc06eb3ae7922442c7b9a970ff6689eb6bef9dc /indra/newview/lltool.cpp | |
parent | 07f1c4c9c59c3b825a605dd9c695aae492bbf09c (diff) | |
parent | 34322f8f37380df868703051230f2a4109602b3f (diff) |
Merged in lindenlab/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) { |