diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-28 11:36:46 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-28 11:36:46 -0500 |
| commit | 98140b3cdcd505aabe31fcd23db7a2603c8deed3 (patch) | |
| tree | b94c39ef7afbc4a091b1e4f2f7b4b2de599831a8 /indra/newview/lltool.cpp | |
| parent | 106c9124741afd50c3aaa5671743d5a939f1ad48 (diff) | |
| parent | 4b354802c10e6e947a0ce0f023158e22fcd5bc4b (diff) | |
merge changes for storm-634
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; } |