diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/lltool.cpp | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltool.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp index d004a2d..9489a2b 100644 --- a/linden/indra/newview/lltool.cpp +++ b/linden/indra/newview/lltool.cpp | |||
@@ -35,6 +35,7 @@ | |||
35 | 35 | ||
36 | #include "llviewerwindow.h" | 36 | #include "llviewerwindow.h" |
37 | #include "lltoolcomp.h" | 37 | #include "lltoolcomp.h" |
38 | #include "lltoolfocus.h" | ||
38 | #include "llfocusmgr.h" | 39 | #include "llfocusmgr.h" |
39 | #include "llagent.h" | 40 | #include "llagent.h" |
40 | #include "llviewborder.h" | 41 | #include "llviewborder.h" |
@@ -154,6 +155,14 @@ BOOL LLTool::handleKey(KEY key, MASK mask) | |||
154 | return FALSE; | 155 | return FALSE; |
155 | } | 156 | } |
156 | 157 | ||
158 | LLTool* LLTool::getOverrideTool(MASK mask) | ||
159 | { | ||
160 | if (mask & MASK_ALT) | ||
161 | { | ||
162 | return gToolCamera; | ||
163 | } | ||
164 | return NULL; | ||
165 | } | ||
157 | 166 | ||
158 | // static | 167 | // static |
159 | void LLTool::onMouseCaptureLost( LLMouseHandler* old_captor ) | 168 | void LLTool::onMouseCaptureLost( LLMouseHandler* old_captor ) |