From 1add5d049a69ab8a59a68964005184dd0ddb36aa Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Sat, 15 Oct 2022 16:02:21 +0200
Subject: [PATCH 1/3] Linux/SDL2: update to SDL2-24-0, thanks PorkChop - might
 already help with FIRE-32074

---
 autobuild.xml                   | 12 ++++++------
 indra/llwindow/llwindowsdl2.cpp | 10 ++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6fcae6e218..750a72bb5a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -22,16 +22,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>db1a758da143fe0177df2b472eaa8d78</string>
+              <string>ba107bef7cdb9c8548d62e749d9af6fd</string>
               <key>url</key>
-              <string>http://3p.firestormviewer.org/SDL2-2.0.20-linux64-222610218.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/SDL2-2.24.1-linux64-222872152.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.0.20</string>
+        <string>2.24.1</string>
       </map>
       <key>gstreamer10</key>
       <map>
@@ -2622,16 +2622,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>411c000af6328e454ff7064f90c18a81</string>
+              <string>8ad6779b81899afb7bd803ac2e2af37a</string>
               <key>url</key>
-              <string>http://3p.firestormviewer.org/open_libndofdev-0.13.222610246-linux64-222610246.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/open_libndofdev-0.13.222872202-linux64-222872202.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
           </map>
         </map>
         <key>version</key>
-        <string>0.13.222441031</string>
+        <string>0.13.222872202</string>
       </map>
       <key>openal</key>
       <map>
diff --git a/indra/llwindow/llwindowsdl2.cpp b/indra/llwindow/llwindowsdl2.cpp
index 5d7d85c912..3e6dcf1ea2 100644
--- a/indra/llwindow/llwindowsdl2.cpp
+++ b/indra/llwindow/llwindowsdl2.cpp
@@ -41,6 +41,10 @@
 #include "llfindlocale.h"
 #include "llframetimer.h"
 
+// if there is a better methood to get at the settings from llwindow/ let me know! -Zi
+#include "llcontrol.h"
+extern LLControlGroup gSavedSettings;
+
 #ifdef LL_GLIB
 #include <glib.h>
 #endif
@@ -675,6 +679,8 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
 
 	// IME - International input compositing, i.e. for Japanese / Chinese text input
 	// Request the IME interface to show over-the-top compositing while typing
+	mIMEEnabled = gSavedSettings.getBOOL("SDL2IMEEnabled");
+
 	if (mIMEEnabled)
 	{
 		SDL_SetHint( SDL_HINT_IME_INTERNAL_EDITING, "1");
@@ -2691,6 +2697,10 @@ void* LLWindowSDL::createSharedContext()
 		LLCoordScreen size;
 		if (getSize(&size))
 		{
+			// tickle window size to fix font going blocky on login screen since SDL 2.24.0
+			size.mX--;
+			setSize(size);
+			size.mX++;
 			setSize(size);
 		}
 

From 562fd838a2683866c2d919ba9cf6e015e71261c1 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 16 Oct 2022 12:21:35 +0200
Subject: [PATCH 2/3] Update FMOD Studio to 2.02.09 on Windows

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 750a72bb5a..4633a697bd 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1112,11 +1112,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ed811d36be10adf2bb63727912ce80a5</string>
+              <string>6dd278518e791dbc2841e337feb295db</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.08-windows-222661019.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.09-windows-222890940.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1126,18 +1126,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>924cde33101376ffd995316a5264d361</string>
+              <string>1b7ced6f750b12f0d014556705019534</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.08-windows64-222661021.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.09-windows64-222890941.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.02.08</string>
+        <string>2.02.09</string>
       </map>
       <key>fontconfig</key>
       <map>

From 1a17c8df44d95d9259dbd4eca5dcac33aff76f8b Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Mon, 17 Oct 2022 05:01:18 +0200
Subject: [PATCH 3/3] Linux: fmodstudio update, patch by PorkChop, thank you!

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 4633a697bd..9887de55cf 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1098,11 +1098,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3f2074002402c2998a20c77f67018f26</string>
+              <string>a45bb657d668b7f1b4fa4c88eb81a80a</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///opt/firestorm/fmodstudio-2.02.08-linux64-222661443.tar.bz2</string>
+              <string>file:///opt/firestorm/fmodstudio-2.02.09-linux64-222891103.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>