merge

indra/newview/tests/llworldmap_test.cpp

indra/newview/tests/llworldmipmap_test.cpp

indra/newview/viewer_manifest.py

indra/test/CMakeLists.txt

indra/test_apps/llplugintest/llmediaplugintest.cpp

indra/viewer_components/updater/llupdatedownloader.cpp

indra/viewer_components/updater/llupdatedownloader.h

indra/viewer_components/updater/llupdateinstaller.cpp

indra/viewer_components/updater/llupdateinstaller.h

indra/viewer_components/updater/llupdaterservice.cpp

indra/viewer_components/updater/llupdaterservice.h

...a/viewer_components/updater/scripts/darwin/update_install

indra/viewer_components/updater/scripts/linux/update_install

...wer_components/updater/scripts/windows/update_install.bat

...viewer_components/updater/tests/llupdaterservice_test.cpp

install.xml

scripts/install.py