Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum/

indra/cmake/GooglePerfTools.cmake

indra/develop.py

indra/llcommon/CMakeLists.txt

indra/llcommon/llassettype.h

indra/llcommon/llchat.h

indra/llcommon/lleventapi.h

indra/llcommon/lleventdispatcher.cpp

indra/llcommon/lleventdispatcher.h

indra/llcommon/llfoldertype.cpp

indra/llcommon/llfoldertype.h

indra/llcommon/llpreprocessor.h

indra/llcommon/llqueuedthread.cpp

indra/llcommon/tests/lltreeiterators_test.cpp

indra/llinventory/llinventory.h

indra/llinventory/llinventorytype.cpp

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginprocesschild.cpp

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llui/llbutton.cpp