Skip to content
Snippets Groups Projects
Commit d6d7aa70 authored by Darl Cat's avatar Darl Cat Committed by Rye Mutt
Browse files

Satisfy the merge gods

parent b2b39cf8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llviewermedia.cpp
+ 2
− 1
View file @ d6d7aa70
...@@ -2117,8 +2117,9 @@ void LLViewerMediaImpl::focus(bool focus) ...@@ -2117,8 +2117,9 @@ void LLViewerMediaImpl::focus(bool focus)
{ {
// call focus just for the hell of it, even though this apopears to be a nop // call focus just for the hell of it, even though this apopears to be a nop
mMediaSource->focus(focus); mMediaSource->focus(focus);
#if LL_LINUX
LLUI::getWindow()->allowLanguageTextInput(NULL, focus); LLUI::getWindow()->allowLanguageTextInput(NULL, focus);
#endif
if (focus) if (focus)
{ {
// spoof a mouse click to *actually* pass focus // spoof a mouse click to *actually* pass focus
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment