diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
| commit | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (patch) | |
| tree | 8b94c90d06bcd0ed5d258ab1e8c5d67024683cab /indra/newview/linux_tools | |
| parent | a5f3ac2a8dc9aee2c04f24c3b3304c1b24808acb (diff) | |
svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
Diffstat (limited to 'indra/newview/linux_tools')
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 2a57b66883..fd15f215c4 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -38,6 +38,7 @@ export LL_GL_BASICEXT=x ## you're building your own viewer, bear in mind that the executable ## in the bin directory will be stripped: you should replace it with ## an unstripped binary before you run. +#export LL_WRAPPER='gdb --args' #export LL_WRAPPER='valgrind --smc-check=all --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp' ## - Avoids an often-buggy X feature that doesn't really benefit us anyway. @@ -68,7 +69,12 @@ if [ -n "$LL_TCMALLOC" ]; then fi fi fi -LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}" $LL_WRAPPER bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat + +export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' +export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin' +export SL_OPT="`cat gridargs.dat` $@" + +eval ${SL_ENV} ${SL_CMD} ${SL_OPT} || echo Unclean shutdown. echo echo '*********************************************************' |