Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

indra/llcommon/CMakeLists.txt

indra/llcommon/llfasttimer.h

indra/llcommon/llthread.cpp

indra/llcommon/llthreadlocalstorage.cpp

indra/llcommon/llthreadlocalstorage.h

indra/llcommon/lltrace.cpp

indra/llcommon/lltrace.h

indra/llcommon/lltraceaccumulators.cpp

indra/llcommon/lltraceaccumulators.h

indra/llcommon/lltracerecording.cpp

indra/llcommon/lltracerecording.h

indra/llcommon/lltracethreadrecorder.cpp

indra/llcommon/lltracethreadrecorder.h

indra/newview/llappviewer.cpp

indra/newview/llscenemonitor.cpp

indra/newview/llstartup.cpp

indra/newview/llviewerassetstats.cpp

indra/newview/llviewercamera.cpp

indra/newview/llviewerdisplay.cpp