diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-03-09 23:42:07 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-03-09 23:42:07 +0000 |
| commit | 7573288ab3ede23f97bff2f5caefcb622e7e9842 (patch) | |
| tree | 1429e7d758e282e123d31a21246603d0b9814273 /indra/newview/linux_tools/wrapper.sh | |
| parent | 2d60d45aead0b49787fb8ad8b5a03614fe17c170 (diff) | |
svn merge -r113780:113785
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732
QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST
improvements - combo merge
Diffstat (limited to 'indra/newview/linux_tools/wrapper.sh')
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index d7b17edbc3..e188abe5d2 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -41,6 +41,17 @@ ## driver bug, try enabling this option and report whether it helps: #export LL_ATI_MOUSE_CURSOR_BUG=x +## - If you experience crashes with streaming video and music, you can +## 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. +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 ## Everything below this line is just for advanced troubleshooters. ##------------------------------------------------------------------- @@ -117,7 +128,7 @@ if [ -n "$LL_RUN_ERR" ]; then LL_RUN_ERR_MSG="" if [ "$LL_RUN_ERR" = "runerr" ]; then # generic error running the binary - echo '*** Unclean shutdown. ***' + echo '*** Bad shutdown. ***' if [ "`uname -m`" = "x86_64" ]; then echo cat << EOFMARKER |