Merged in SL-18332 (pull request #1194)

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llpostprocess.cpp

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/newview/app_settings/settings.xml

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

...view/app_settings/shaders/class1/deferred/blurLightF.glsl

...view/app_settings/shaders/class1/deferred/blurLightV.glsl

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

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

...iew/app_settings/shaders/class1/deferred/dofCombineF.glsl

...view/app_settings/shaders/class1/deferred/luminanceF.glsl

...view/app_settings/shaders/class1/deferred/luminanceV.glsl

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

...pp_settings/shaders/class1/deferred/multiPointLightV.glsl

...app_settings/shaders/class1/deferred/multiSpotLightF.glsl

...iew/app_settings/shaders/class1/deferred/pointLightF.glsl