Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics

indra/llcommon/llfasttimer.cpp

indra/llcommon/lltracerecording.h

indra/llmessage/lldatapacker.h

...settings/shaders/class1/interface/twotexturecompareF.glsl

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llface.cpp

indra/newview/llscenemonitor.cpp

indra/newview/llviewercamera.h

indra/newview/llviewermenu.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewerobject.cpp

indra/newview/llviewerobject.h

indra/newview/llviewerobjectlist.cpp

indra/newview/llviewerobjectlist.h

indra/newview/llvieweroctree.cpp

indra/newview/llvieweroctree.h

indra/newview/llviewerregion.cpp

indra/newview/llviewerregion.h

indra/newview/llviewershadermgr.cpp