diff options
| author | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
| commit | d26567915cd80999260edffc41df467a7cbbd80c (patch) | |
| tree | 84072d2a7a5e6afa7b57850ed4b325439cb2be16 /indra/newview/llviewermediafocus.cpp | |
| parent | 7528855442a100cee379b9e409280a69caa78bba (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge with Master after Viewer release
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
| -rw-r--r-- | indra/newview/llviewermediafocus.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index 10099eda5b..ba80eeb6b6 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -340,15 +340,6 @@ BOOL LLViewerMediaFocus::handleKey(KEY key, MASK mask, BOOL called_from_parent) clearFocus(); } - - if ( KEY_F1 == key && LLUI::getInstance()->mHelpImpl && mMediaControls.get()) - { - std::string help_topic; - if (mMediaControls.get()->findHelpTopic(help_topic)) - { - LLUI::getInstance()->mHelpImpl->showTopic(help_topic); - } - } } return true; |