Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into master

.clang-format

indra/edit-me-to-trigger-new-build.txt

indra/llinventory/llsettingssky.cpp

indra/llrender/llimagegl.cpp

indra/llrender/llrender.cpp

indra/llrender/llrendertarget.cpp

indra/llrender/llshadermgr.cpp

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

...newview/app_settings/shaders/class1/deferred/cloudsV.glsl

...pp_settings/shaders/class1/deferred/fullbrightShinyF.glsl

...wview/app_settings/shaders/class1/deferred/materialF.glsl

...a/newview/app_settings/shaders/class1/deferred/moonF.glsl

...a/newview/app_settings/shaders/class1/deferred/moonV.glsl

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl

indra/newview/app_settings/shaders/class1/deferred/skyV.glsl

...ew/app_settings/shaders/class1/deferred/softenLightF.glsl

.../app_settings/shaders/class1/environment/encodeNormF.glsl

...app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl

...gs/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl