Merge branch 'master' into DRTVWR-501-maint

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/linux_tools/client-readme.txt

indra/newview/linux_tools/wrapper.sh

indra/newview/llprogressview.cpp

indra/newview/llprogressview.h

indra/newview/llstartup.cpp

indra/newview/llviewerparcelmgr.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llviewerwindow.h

indra/newview/skins/default/textures/3p_icons/fmod_logo.png

indra/newview/skins/default/textures/3p_icons/havok_logo.png

indra/newview/skins/default/textures/3p_icons/vivox_logo.png

indra/newview/skins/default/textures/textures.xml

...wview/skins/default/textures/widgets/ProgressBarSolid.png

indra/newview/skins/default/xui/en/panel_progress.xml

indra/newview/viewer_manifest.py