diff options
| author | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
| commit | 50d21a75a7c6a41a5a3355a8c4406a33454c70dd (patch) | |
| tree | e2fe3e855d710700cd956b505a3f0548038c9dac /indra/newview/lltool.cpp | |
| parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
| parent | 4bdac3f152862b257b9babe9b5a43329c9f544f9 (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; } |