Merged latest lindenlab/viewer-development with mani_linden/viewer-development

indra/CMakeLists.txt

indra/cmake/00-Common.cmake

indra/cmake/LLAddBuildTest.cmake

indra/linux_updater/linux_updater.cpp

indra/llcommon/CMakeLists.txt

indra/llcommon/llfile.cpp

indra/llcommon/llthread.cpp

indra/llcommon/llthreadsafequeue.cpp

indra/llcommon/llthreadsafequeue.h

indra/llui/llui.cpp

indra/llxml/llcontrol.cpp

indra/mac_updater/mac_updater.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/generate_breakpad_symbols.py

indra/newview/installers/windows/installer_template.nsi

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llchiclet.cpp