diff options
| author | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 17:14:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 17:14:24 -0700 |
| commit | 645cf6a5d26b21cd873238c2ac8417d0b1abd37a (patch) | |
| tree | 2690e7dc8a233bd000f4ffd288aafcb1007006ea /indra/newview/llwindowlistener.cpp | |
| parent | 9f95e619c9802bd405db43afa3fbf6b5ad82799d (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-519
Diffstat (limited to 'indra/newview/llwindowlistener.cpp')
| -rw-r--r-- | indra/newview/llwindowlistener.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llwindowlistener.cpp b/indra/newview/llwindowlistener.cpp index 9e4297baaf..aa8c79b0d2 100644 --- a/indra/newview/llwindowlistener.cpp +++ b/indra/newview/llwindowlistener.cpp @@ -37,7 +37,7 @@ #include "llview.h" #include "llviewinject.h" #include "llviewerwindow.h" -#include "llviewerkeyboard.h" +#include "llviewerinput.h" #include "llrootview.h" #include "llsdutil.h" #include "stringize.h" @@ -279,7 +279,7 @@ void LLWindowListener::keyDown(LLSD const & evt) response.setResponse(target_view->getInfo()); gFocusMgr.setKeyboardFocus(target_view); - gViewerKeyboard.handleKey(key, mask, false); + gViewerInput.handleKey(key, mask, false); if(key < 0x80) mWindow->handleUnicodeChar(key, mask); } else @@ -291,7 +291,7 @@ void LLWindowListener::keyDown(LLSD const & evt) } else { - gViewerKeyboard.handleKey(key, mask, false); + gViewerInput.handleKey(key, mask, false); if(key < 0x80) mWindow->handleUnicodeChar(key, mask); } } |