Merge branch 'main' into DRTVWR-559

1 files changed, 10 insertions, 3 deletions

diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 7f70c2ae5f..cb53c28265 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1419,17 +1419,24 @@ BOOL LLWindowSDL::copyTextToPrimary(const LLWString &text)
 
 BOOL LLWindowSDL::isClipboardTextAvailable()
 {
-	return FALSE; // unsupported
+	return SDL_HasClipboardText();
 }
 
 BOOL LLWindowSDL::pasteTextFromClipboard(LLWString &dst)
 {
-	return FALSE; // unsupported
+	auto data = SDL_GetClipboardText();
+	if (data)
+	{
+		dst = LLWString(utf8str_to_wstring(data));
+		SDL_free(data);
+		return TRUE;
+	}
+	return FALSE;
 }
 
 BOOL LLWindowSDL::copyTextToClipboard(const LLWString &s)
 {
-	return FALSE;  // unsupported
+	return !SDL_SetClipboardText(wstring_to_utf8str(s).c_str());
 }
 
 BOOL LLWindowSDL::isPrimaryTextAvailable()