merge up to integration repo

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

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

...ettings/shaders/class1/deferred/fullbrightAlphaMaskF.glsl

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

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

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

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

...ngs/shaders/class1/deferred/postDeferredGammaCorrect.glsl

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

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

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

.../newview/app_settings/shaders/class2/deferred/alphaV.glsl

...app_settings/shaders/class2/deferred/multiSpotLightF.glsl

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

...view/app_settings/shaders/class2/deferred/spotLightF.glsl

indra/newview/lldrawable.cpp

indra/newview/lldrawpoolsimple.cpp

indra/newview/llviewershadermgr.cpp

indra/newview/llviewershadermgr.h

indra/newview/llvovolume.cpp