diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-13 17:51:14 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-13 17:51:14 -0500 |
| commit | 27f11d9868bc72e7096ae6266af1c6c9318c545e (patch) | |
| tree | 12190521b6870891072e312c8b3e8864721aa075 /indra/newview/lltool.cpp | |
| parent | fbab245e487650d6420c9fe33cf07123af12f422 (diff) | |
| parent | dd06d42c09e5e1f4b28559059ec8393e53f767a7 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltool.cpp')
| -rw-r--r-- | indra/newview/lltool.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp index 282d4e19c6..2d8ce95347 100644 --- a/indra/newview/lltool.cpp +++ b/indra/newview/lltool.cpp @@ -33,6 +33,7 @@ #include "llview.h" #include "llviewerwindow.h" +#include "llviewercontrol.h" #include "lltoolcomp.h" #include "lltoolfocus.h" #include "llfocusmgr.h" @@ -190,9 +191,12 @@ LLTool* LLTool::getOverrideTool(MASK mask) { return NULL; } - if (mask & MASK_ALT) + if (gSavedSettings.getBOOL("EnableAltZoom")) { - return LLToolCamera::getInstance(); + if (mask & MASK_ALT) + { + return LLToolCamera::getInstance(); + } } return NULL; } |