From d6d7aa70e739c05ff23b94eca455831d78b98c47 Mon Sep 17 00:00:00 2001
From: Unexpectedly Dismantled <darl@alchemyviewer.org>
Date: Wed, 20 Apr 2022 19:52:29 -0400
Subject: [PATCH] Satisfy the merge gods
---
indra/newview/llviewermedia.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 74df92602d7..162466a260d 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -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
mMediaSource->focus(focus);
+#if LL_LINUX
LLUI::getWindow()->allowLanguageTextInput(NULL, focus);
-
+#endif
if (focus)
{
// spoof a mouse click to *actually* pass focus
--
GitLab