Merge

indra/cmake/TemplateCheck.cmake

indra/llcharacter/llkeyframemotion.h

indra/llcommon/llapp.h

indra/llcommon/llapr.h

indra/llcommon/llcommon.h

indra/llcommon/llerror.cpp

indra/llcommon/llthread.h

indra/llmessage/lliohttpserver.h

indra/llplugin/llpluginprocessparent.h

indra/llui/CMakeLists.txt

indra/llui/lldockablefloater.cpp

indra/llui/llpanel.cpp

indra/llvfs/llpidlock.cpp

indra/llvfs/llpidlock.h

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/linux_tools/client-readme-voice.txt

indra/newview/linux_tools/client-readme.txt

indra/newview/llagent.cpp