diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-27 15:25:47 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-27 15:25:47 +0300 |
| commit | f71cce50f26c197c1b2ce510b7a646d22a2eab26 (patch) | |
| tree | 16c8a7c83259c30301411ae5cd65dbe679066dec /indra/newview/llappviewer.cpp | |
| parent | 4080969968c5bac301d754e58ff938df6cbdb5a5 (diff) | |
SL-6109 Small reorganisation
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 97e770a106..1023a553f8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -149,7 +149,7 @@ #include "llapr.h" #include <boost/lexical_cast.hpp> -#include "llviewerkeyboard.h" +#include "llviewerinput.h" #include "lllfsthread.h" #include "llworkerthread.h" #include "lltexturecache.h" @@ -1006,11 +1006,11 @@ bool LLAppViewer::init() // Load User's bindings std::string key_bindings_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "keys.xml"); - if (!gDirUtilp->fileExists(key_bindings_file) || !gViewerKeyboard.loadBindingsXML(key_bindings_file)) + if (!gDirUtilp->fileExists(key_bindings_file) || !gViewerInput.loadBindingsXML(key_bindings_file)) { // Failed to load custom bindings, try default ones key_bindings_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "keys.xml"); - if (!gViewerKeyboard.loadBindingsXML(key_bindings_file)) + if (!gViewerInput.loadBindingsXML(key_bindings_file)) { LL_ERRS("InitInfo") << "Unable to open default key bindings from" << key_bindings_file << LL_ENDL; } @@ -1446,7 +1446,7 @@ bool LLAppViewer::doFrame() { joystick->scanJoystick(); gKeyboard->scanKeyboard(); - gViewerKeyboard.scanMouse(); + gViewerInput.scanMouse(); } // Update state based on messages, user input, object idle. |