diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/linux_tools/client-readme.txt | 3 | ||||
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 13 | ||||
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 6 |
3 files changed, 20 insertions, 2 deletions
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt index 2edc11e305..99c973f7ea 100644 --- a/indra/newview/linux_tools/client-readme.txt +++ b/indra/newview/linux_tools/client-readme.txt @@ -53,7 +53,8 @@ Minimum requirements: * Computer Memory: 512MB (recommended: 768MB or more) * Linux Operating System: A reasonably modern 32-bit Linux environment is required. If you are running a 64-bit Linux distribution then - you will need its 32-bit compatibility environment installed. + you will need its 32-bit compatibility environment installed, but + this configuration is not currently supported. * Video/Graphics Card: o nVidia GeForce 2, GeForce 4mx, or better (recommend one of the following: 6700, 6800, 7600, 7800, 7900, 8400, 8500, 8600, 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 diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 0778503a92..8b81478eaf 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -332,6 +332,12 @@ LLAppViewerLinux::~LLAppViewerLinux() bool LLAppViewerLinux::init() { + // g_thread_init() must be called before *any* use of glib, *and* + // before any mutexes are held, *and* some of our third-party + // libraries likes to use glib functions; in short, do this here + // really early in app startup! + if (!g_thread_supported ()) g_thread_init (NULL); + return LLAppViewer::init(); } |