Merge branch 'DRTVWR-564' of bitbucket.org:lindenlab/viewer into SL-17485

indra/llcommon/CMakeLists.txt

indra/llcommon/commoncontrol.cpp

indra/llcommon/commoncontrol.h

indra/llcommon/threadpool.cpp

indra/llcommon/threadpool.h

indra/llimage/llimageworker.cpp

indra/llimage/llimageworker.h

indra/llimage/tests/llimageworker_test.cpp

indra/llrender/llimagegl.cpp

indra/llwindow/llwindowwin32.cpp

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/lltexturefetch.cpp

indra/newview/llviewertexture.cpp

indra/newview/llviewerwindow.cpp

indra/newview/tests/llviewercontrollistener_test.cpp

indra/test/test.cpp