diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:33:42 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:33:42 -0800 |
| commit | 1e050c2ed87ae2093623fa4c66a69aeee1fb980c (patch) | |
| tree | ff9bf66608dc3b9c4459daa68ec99a3065182aac /indra/newview/lltool.cpp | |
| parent | 36954908632d6f5366f6517023676c1bcd71aa17 (diff) | |
| parent | d276950c8d4d53f9d5d6497d5a4a4582c499938a (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; } |