summaryrefslogtreecommitdiff
path: root/indra/newview/linux_tools/launch_url.sh
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/linux_tools/launch_url.sh')
-rwxr-xr-xindra/newview/linux_tools/launch_url.sh14
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/linux_tools/launch_url.sh b/indra/newview/linux_tools/launch_url.sh
index e6450ad5ff..d2c8919d46 100755
--- a/indra/newview/linux_tools/launch_url.sh
+++ b/indra/newview/linux_tools/launch_url.sh
@@ -17,10 +17,16 @@
URL="$1"
if [ -z "$URL" ]; then
- echo Usage: $0 URL
+ echo "Usage: $0 URL"
exit
fi
+# restore LD_LIBRARY_PATH from SAVED_LD_LIBRARY_PATH if it exists
+if [ "${SAVED_LD_LIBRARY_PATH+isset}" = "isset" ]; then
+ export LD_LIBRARY_PATH="${SAVED_LD_LIBRARY_PATH}"
+ echo "$0: Restored library path to '${SAVED_LD_LIBRARY_PATH}'"
+fi
+
# if $BROWSER is defined, use it.
XBROWSER=`echo "$BROWSER" |cut -f1 -d:`
if [ ! -z "$XBROWSER" ]; then
@@ -37,8 +43,8 @@ if [ ! -z "$XBROWSER" ]; then
$XBROWSER "$URL" &
exit
fi
- echo "Couldn't find the browser specified by \$BROWSER ($BROWSER)"
- echo "Trying some others..."
+ echo "$0: Couldn't find the browser specified by \$BROWSER ($BROWSER)"
+ echo "$0: Trying some others..."
fi
# else kfmclient
@@ -81,6 +87,6 @@ if which netscape >/dev/null; then
exit
fi
-echo 'Failed to find a known browser. Please consider setting the $BROWSER environment variable.'
+echo '$0: Failed to find a known browser. Please consider setting the $BROWSER environment variable.'
# end.