Second Life viewer sources 1.18.4.0-RC

4 files changed, 37 insertions, 7 deletions

diff --git a/linden/indra/newview/linux_tools/client-readme.txt b/linden/indra/newview/linux_tools/client-readme.txt
index 59ebf67..641705d 100644
--- a/linden/indra/newview/linux_tools/client-readme.txt
+++ b/linden/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/linden/indra/newview/linux_tools/exposed-symbols.txt b/linden/indra/newview/linux_tools/exposed-symbols.txt
index 98df90a..f12fbfa 100644
--- a/linden/indra/newview/linux_tools/exposed-symbols.txt
+++ b/linden/indra/newview/linux_tools/exposed-symbols.txt
@@ -1,3 +1,4 @@
 initllpython
 createLLImageJ2CKDU
 destroyLLImageJ2CKDU
+engineInfoLLImageJ2CKDU
diff --git a/linden/indra/newview/linux_tools/launch_url.sh b/linden/indra/newview/linux_tools/launch_url.sh
index a1c6f5d..e6450ad 100755
--- a/linden/indra/newview/linux_tools/launch_url.sh
+++ b/linden/indra/newview/linux_tools/launch_url.sh
@@ -1,5 +1,4 @@
-#!/bin/sh
-# Script tested with: bash 1.14, bash 3.1.17, zsh 4.2.5, ksh 1993-12-28
+#!/bin/bash
 
 # This script loads a web page in the 'default' graphical web browser.
 # It MUST return immediately (or soon), so the browser should be
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index fd15f21..10041ee 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -1,5 +1,4 @@
-#!/bin/sh
-# Script tested with: bash 1.14, bash 3.1.17, zsh 4.2.5, ksh 1993-12-28
+#!/bin/bash
 
 ## Here are some configuration options for Linux Client Alpha Testers.
 ## These options are for self-assisted troubleshooting during this alpha
@@ -33,6 +32,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 +50,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.
 ##-------------------------------------------------------------------
 
@@ -74,7 +83,30 @@ export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-
 export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'
 export SL_OPT="`cat gridargs.dat` $@"
 
-eval ${SL_ENV} ${SL_CMD} ${SL_OPT} || echo Unclean shutdown.
+# Run the program
+eval ${SL_ENV} ${SL_CMD} ${SL_OPT} || LL_RUN_ERR=runerr
+
+# Handle any resulting errors
+if [ -n "$LL_RUN_ERR" ]; then
+        LL_RUN_ERR_MSG=""
+        if [ "$LL_RUN_ERR" = "runerr" ]; then
+                # generic error running the binary
+                echo '*** Unclean shutdown. ***'
+                if [ "`arch`" = "x86_64" ]; then
+                        echo
+                        cat << EOFMARKER
+You are running the Second Life Viewer on a x86_64 platform.  The
+most common problems when launching the Viewer (particularly
+'bin/do-not-directly-run-secondlife-bin: not found' and 'error while
+loading shared libraries') may be solved by installing your Linux
+distribution's 32-bit compatibility packages.
+For example, on Ubuntu and other Debian-based Linuxes you might run:
+$ sudo apt-get install ia32-libs ia32-libs-gtk ia32-libs-kde ia32-libs-sdl
+EOFMARKER
+                fi
+        fi
+fi
+        
 
 echo
 echo '*********************************************************'