From b089fc559a5dc527ed5e0422e82abf3b1dd5f1b2 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 28 Sep 2007 23:32:53 +0000
Subject: EFFECTIVE MERGE: svn merge -r 68999:69916
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release **
This should be the last merge from branches/maintenance. All future merges
will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
---
indra/newview/linux_tools/wrapper.sh | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
(limited to 'indra/newview/linux_tools/wrapper.sh')
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index ac967c4853..f720fc0ec1 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -84,7 +84,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 '*********************************************************'
--
cgit v1.2.3