diff options
| author | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
| commit | 13c391f1984bb8cb9d67a7729af2ee5714409215 (patch) | |
| tree | 112edff1d25adabb4893e6746ba76a4182865f8a /indra/newview/linux_tools/wrapper.sh | |
| parent | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (diff) | |
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
Diffstat (limited to 'indra/newview/linux_tools/wrapper.sh')
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index fd15f215c4..ac967c4853 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -33,6 +33,10 @@ export LL_GL_BASICEXT=x ## LL_GL_BLACKLIST which solves your problems. #export LL_GL_BLACKLIST=abcdefghijklmno + +## Everything below this line is just for advanced troubleshooters. +##------------------------------------------------------------------- + ## - For advanced debugging cases, you can run the viewer under the ## control of another program, such as strace, gdb, or valgrind. If ## you're building your own viewer, bear in mind that the executable @@ -47,6 +51,12 @@ export SDL_VIDEO_X11_DGAMOUSE=0 ## - Works around a problem with misconfigured 64-bit systems not finding GL export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH}":/usr/lib64/dri:/usr/lib32/dri:/usr/lib/dri +## - The 'scim' GTK IM module widely crashes the viewer. Avoid it. +if [ "$GTK_IM_MODULE" = "scim" ]; then + export GTK_IM_MODULE=xim +fi + + ## Nothing worth editing below this line. ##------------------------------------------------------------------- |