diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
| commit | ce7682c2a468e926d6b38e4f95bd289a8d26222c (patch) | |
| tree | 80535a3916676294d640b4ce47c1895d0a27cd1b /indra/newview/linux_tools | |
| parent | e1ab7d8a30cc40cbd1d471c67def21508c82ff49 (diff) | |
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
Diffstat (limited to 'indra/newview/linux_tools')
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index d77da8814c..d39fc3a8d1 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -48,6 +48,23 @@ export SDL_VIDEO_X11_DGAMOUSE=0 RUN_PATH=`dirname "$0" || echo .` cd "${RUN_PATH}" +if [ -n "$LL_TCMALLOC" ]; then + tcmalloc_libs='/usr/lib/libtcmalloc.so.0 /usr/lib/libstacktrace.so.0 /lib/libpthread.so.0' + all=1 + for f in $tcmalloc_libs; do + if [ ! -f $f ]; then + all=0 + fi + done + if [ $all != 1 ]; then + echo 'Cannot use tcmalloc libraries: components missing' 1>&2 + else + export LD_PRELOAD=$(echo $tcmalloc_libs | tr ' ' :) + if [ -z "$HEAPCHECK" -a -z "$HEAPPROFILE" ]; then + export HEAPCHECK=${HEAPCHECK:-normal} + 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 echo |