Set correct paths when running in 32bit mode on 64bit Linux.

1 files changed, 3 insertions, 25 deletions

diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 93258f4..8a81843 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -45,16 +45,6 @@
 ##   disable these by enabling this option:
 #export LL_DISABLE_GSTREAMER=x
 
-## - GStreamer is automatically disabled - for now - on 64-bit systems due
-##   to common fatal incompatibilities; remove/comment these lines if you want
-##   to try anyway.
-
-#FIXME:->
-#if [ "`uname -m`" = "x86_64" ]; then
-#    export LL_DISABLE_GSTREAMER=x
-#    echo '64-bit Linux detected: Disabling GStreamer (streaming video and music) by default; edit ./secondlife to re-enable.'
-#fi
-#FIXME:<-
 
 ## Everything below this line is just for advanced troubleshooters.
 ##-------------------------------------------------------------------
@@ -117,7 +107,7 @@ if [ -n "$LL_TCMALLOC" ]; then
     fi
 fi
 
-if [ "`uname -m`" = "x86_64" ]; then
+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}"'
@@ -125,6 +115,7 @@ 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,19 +129,6 @@ if [ -n "$LL_RUN_ERR" ]; 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: <-
+
         fi
 fi