diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:18 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-12-14 12:07:18 -0800 |
| commit | 4c791e098d3abafa406e0e269038c40aae67f66c (patch) | |
| tree | d566be04939faf3dc29655a8113afc067b2b7c99 /indra/newview/llappviewer.cpp | |
| parent | c74dbc6e5b117bcd020c0efecf5255ad731f310f (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-596
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 1fc4a8532d..4a43133ff6 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -196,6 +196,7 @@ #include "llhudeffecttrail.h" #include "llvectorperfoptions.h" #include "llslurl.h" +#include "llurlregistry.h" #include "llwatchdog.h" // Included so that constants/settings might be initialized @@ -4312,6 +4313,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() |