1 files changed, 7 insertions, 18 deletions

diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index dbe96ba..7a0c973 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -119,14 +119,17 @@ if [ -n "$LL_TCMALLOC" ]; then
     fi
 fi
 
-if [ "`uname -m`" = "x86_64" ]; then
+# 64-bit Linux
+if ( [ "`uname -m`" = "x86_64" ] && [ -d ${RUN_PATH}/app_settings/mozilla-runtime-linux-x86_64/ ] ); then
         export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib64/gstreamer-plugins/"
-
         export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"'
+
+# 32-bit Linux
 else
         export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/"
         export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
 fi
+
 export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin'
 export SL_OPT="`cat gridargs.dat` $@"
 
@@ -138,21 +141,7 @@ if [ -n "$LL_RUN_ERR" ]; then
         LL_RUN_ERR_MSG=""
         if [ "$LL_RUN_ERR" = "runerr" ]; then
                 # generic error running the binary
-                echo '*** Bad shutdown. ***'
-
-#FIXME: ->
-#               if [ "`uname -m`" = "x86_64" ]; then
-#                       echo
-#                       cat << EOFMARKER
-#You are running the Imprudence Viewer on a x86_64 platform.  The
-#most common problems when launching the Viewer (particularly
-#'bin/do-not-directly-run-imprudence-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
-#FIXME: <-
+                echo '*** Unclean shutdown. ***'
+
         fi
 fi