diff --git a/indra/newview/app_settings/client_tags_sg1.xml b/indra/newview/app_settings/client_tags_sg1.xml index bdbd53003..c533f419e 100644 --- a/indra/newview/app_settings/client_tags_sg1.xml +++ b/indra/newview/app_settings/client_tags_sg1.xml @@ -786,6 +786,18 @@ 0.7843137254902 1 + + 5886ec80-cf56-11e1-9b23-0800200c9a66 + + name + Voodoo + color + + 0.70588235294118 + 0.7843137254902 + 0.7843137254902 + 1 + 734bae36-a197-b087-ee2d-a098d58fed55 diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index ea944f1c2..04edf2a76 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -59,8 +59,15 @@ ## 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 --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp' +if [ -n "$ASCENDED_DEVELOPER" ]; then + if [ "$ASCENDED_DEVELOPER" = "1" ]; then + export LL_WRAPPER='gdb --args' + elif [ "$ASCENDED_DEVELOPER" = "2" ]; then + 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' + elif [ "$ASCENDED_DEVELOPER" = "3" ]; then + export LL_WRAPPER='strace -f -ff -o singularity.strace' + fi +fi ## - This allows one to set an arbitrary value for LD_PRELOAD. ## It won't work if LL_TCMALLOC is set because that uses it's