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

indra/llcommon/lltrace.h

indra/llcommon/lltraceaccumulators.cpp

indra/llcommon/lltraceaccumulators.h

indra/llcommon/lltracerecording.cpp

indra/llcommon/lltracerecording.h

indra/llcommon/llunittype.h

indra/llimage/llimage.cpp

indra/llimage/llimagej2c.cpp

indra/llimage/llimagejpeg.cpp

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/llrender/llfontbitmapcache.cpp

indra/llrender/llfontbitmapcache.h

indra/llrender/llfontfreetype.cpp

indra/llrender/llfontfreetype.h

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/llui/llfolderviewitem.cpp