diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:54:45 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:54:45 -0800 |
| commit | 740bd8dbfd791bdd548064912abad8c0bf230f4c (patch) | |
| tree | bd237c8141a0b5643038640f4bc24d1fb6d5fd65 /indra/newview/lltool.cpp | |
| parent | 049b00a6f10d50609055810b0800f49476b351d2 (diff) | |
| parent | ab100825bd0064dc64b9ef8bea1c70bc04090716 (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; } |