summaryrefslogtreecommitdiff
path: root/indra/newview/lltool.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2019-08-21 21:51:56 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2019-08-21 21:51:56 +0100
commit63f82fc44b721b0ec437845d41b5a2055a44be68 (patch)
tree3d3caee52df32234073c0e2da18b9f7eed7722d3 /indra/newview/lltool.cpp
parent755b396045fd464dd2d7fc10239bf775cc54d074 (diff)
parente9ead7cc2ee9970b468ef6de0ba57726bb203ef4 (diff)
merge
Diffstat (limited to 'indra/newview/lltool.cpp')
-rw-r--r--indra/newview/lltool.cpp4
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)
{