Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/newview/llfloaterenvironmentadjust.cpp

indra/newview/llfloatertools.cpp

indra/newview/llmaterialeditor.cpp

indra/newview/llmaterialeditor.h

indra/newview/llpaneleditsky.cpp

indra/newview/llpanelface.cpp

indra/newview/lltexturectrl.cpp

indra/newview/llviewershadermgr.cpp

indra/newview/llviewertexture.cpp

...wview/skins/default/xui/en/floater_adjust_environment.xml

...newview/skins/default/xui/en/panel_settings_sky_atmos.xml