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);
 		}