2 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt
index 59ebf6793a..641705da53 100644
--- a/indra/newview/linux_tools/client-readme.txt
+++ b/indra/newview/linux_tools/client-readme.txt
@@ -99,8 +99,6 @@ the Alpha release of the Linux client.
 
 * VOICE COMMUNICATION - this is not yet available in the Linux client.
 
-* STREAMING MOVIES - these are currently disabled while we work on some issues.
-
 * VISUAL EFFECTS AND PERFORMANCE - many Linux graphics drivers are not as
   robust as their counterparts for other operating systems, so some advanced
   Second Life graphical features have been DISABLED by default to aid
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index fd15f215c4..ac967c4853 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -33,6 +33,10 @@ export LL_GL_BASICEXT=x
 ##   LL_GL_BLACKLIST which solves your problems.
 #export LL_GL_BLACKLIST=abcdefghijklmno
 
+
+## Everything below this line is just for advanced troubleshooters.
+##-------------------------------------------------------------------
+
 ## - For advanced debugging cases, you can run the viewer under the
 ##   control of another program, such as strace, gdb, or valgrind.  If
 ##   you're building your own viewer, bear in mind that the executable
@@ -47,6 +51,12 @@ export SDL_VIDEO_X11_DGAMOUSE=0
 ## - Works around a problem with misconfigured 64-bit systems not finding GL
 export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH}":/usr/lib64/dri:/usr/lib32/dri:/usr/lib/dri
 
+## - The 'scim' GTK IM module widely crashes the viewer.  Avoid it.
+if [ "$GTK_IM_MODULE" = "scim" ]; then
+    export GTK_IM_MODULE=xim
+fi
+
+
 ## Nothing worth editing below this line.
 ##-------------------------------------------------------------------