diff options
| author | Signal Linden <signal@lindenlab.com> | 2023-11-21 08:07:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 08:07:20 -0800 |
| commit | 5416d94d07ac85ba384fafb0b0b1b11b8cd0b6e4 (patch) | |
| tree | 1c4fd503f43d628dd6223af44aa14921357ae0ab /indra/newview/llappviewer.cpp | |
| parent | 9b50c50bf2fe3fab2dbb0bcd18d7c8f5b9a13a1b (diff) | |
| parent | 62c7a17604ba4faec989465a374e7ed7627ec56b (diff) | |
Merge branch 'DRTVWR-587-maint-V' into signal/simple-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5763ebe721..4bab51a1f5 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -195,6 +195,7 @@ #include "llhudeffecttrail.h" #include "llvectorperfoptions.h" #include "llslurl.h" +#include "llurlregistry.h" #include "llwatchdog.h" // Included so that constants/settings might be initialized @@ -4295,6 +4296,7 @@ void LLAppViewer::loadKeyBindings() LL_ERRS("InitInfo") << "Unable to open default key bindings from " << key_bindings_file << LL_ENDL; } } + LLUrlRegistry::instance().setKeybindingHandler(&gViewerInput); } void LLAppViewer::purgeCache() |