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

indra/llcommon/lltrace.h

indra/llcommon/lltracerecording.h

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llmessage/llassetstorage.cpp

indra/llui/llstatbar.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/llui/llviewmodel.cpp

indra/llui/llviewmodel.h

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/lldrawable.cpp

indra/newview/lldrawable.h

indra/newview/llfloaterjoystick.cpp

indra/newview/llfloatersnapshot.cpp

indra/newview/llhudnametag.cpp

indra/newview/llnearbychatbar.cpp