summaryrefslogtreecommitdiff
path: root/indra/newview/linux_tools
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-02 15:17:50 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-02 15:17:50 +0200
commitbe1739c5d584495c3cd946fd3e156d4b2ac0a2b2 (patch)
tree0eef774227e9627f9b3523a0ef79333d2a33ec8d /indra/newview/linux_tools
parent9c8a8f388ab24c404f19602e156a76ad1a03b841 (diff)
parentd1d195ba904490c19faf2078560f49c3a6b16a18 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/linux_tools')
-rwxr-xr-xindra/newview/linux_tools/wrapper.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index f84102e1fb..d2df968544 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -41,16 +41,8 @@
## 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.'
+ echo '64-bit Linux detected.'
fi
## Everything below this line is just for advanced troubleshooters.