diff options
| author | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
| commit | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (patch) | |
| tree | e7c0b2e22d4719123fd688e49a16b76a084c3f77 /indra/newview/lltool.cpp | |
| parent | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (diff) | |
merge -r 56779:58057 /branches/selection_management
Diffstat (limited to 'indra/newview/lltool.cpp')
| -rw-r--r-- | indra/newview/lltool.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp index f9ff070289..1053e4a569 100644 --- a/indra/newview/lltool.cpp +++ b/indra/newview/lltool.cpp @@ -16,6 +16,7 @@ #include "llviewerwindow.h" #include "lltoolcomp.h" +#include "lltoolfocus.h" #include "llfocusmgr.h" #include "llagent.h" #include "llviewborder.h" @@ -135,6 +136,14 @@ BOOL LLTool::handleKey(KEY key, MASK mask) return FALSE; } +LLTool* LLTool::getOverrideTool(MASK mask) +{ + if (mask & MASK_ALT) + { + return gToolCamera; + } + return NULL; +} // static void LLTool::onMouseCaptureLost( LLMouseHandler* old_captor ) |