Merge from default branch

indra/llcommon/llallocator_heap_profile.cpp

indra/llcommon/lldate.cpp

indra/llcommon/llprocessor.cpp

indra/llcommon/llstring.h

indra/llcommon/lluri.cpp

indra/llmath/lloctree.h

indra/llmessage/llcachename.cpp

indra/llmessage/llmessagetemplateparser.cpp

indra/llmessage/llnamevalue.cpp

indra/llmessage/lltemplatemessagebuilder.cpp

indra/llmessage/lltransfermanager.cpp

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/slplugin/slplugin.cpp

indra/llrender/llfontbitmapcache.cpp

indra/llrender/llimagegl.cpp

indra/llrender/llvertexbuffer.cpp

indra/llui/llmenugl.cpp

indra/llui/llnotifications.cpp

indra/llui/lltabcontainer.cpp

indra/newview/CMakeLists.txt