diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-04-24 18:38:17 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-04-24 18:38:17 +0000 |
| commit | 5c51ae5a7b48dfac8769e5dbdd10e79b18d90070 (patch) | |
| tree | f63729c72f69dcb7d2bd5d9aa3a58c29e0c78128 /indra/newview | |
| parent | 39018947081772bf7226d757c647520c54b18fd2 (diff) | |
svn merge -r 85582:85586 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge
QAR-500 maint-viewer-5 merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 1b7d6b809e..eaa2f61dce 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -43,7 +43,7 @@ ## 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' +#export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --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. export SDL_VIDEO_X11_DGAMOUSE=0 @@ -104,7 +104,7 @@ if [ -n "$LL_RUN_ERR" ]; then if [ "$LL_RUN_ERR" = "runerr" ]; then # generic error running the binary echo '*** Unclean shutdown. ***' - if [ "`arch`" = "x86_64" ]; then + if [ "`uname -m`" = "x86_64" ]; then echo cat << EOFMARKER You are running the Second Life Viewer on a x86_64 platform. The |