Merged DRTVWR-559 into SL-18290

indra/llrender/llrendertarget.cpp

indra/llrender/llshadermgr.cpp

indra/newview/CMakeLists.txt

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

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

...wview/app_settings/shaders/class1/environment/waterF.glsl

...ew/app_settings/shaders/class1/environment/waterFogF.glsl

...wview/app_settings/shaders/class1/environment/waterV.glsl

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

...wview/app_settings/shaders/class2/environment/waterF.glsl

indra/newview/lldrawpool.cpp

indra/newview/lldrawpool.h

indra/newview/lldrawpoolwater.cpp

indra/newview/lldrawpoolwater.h

indra/newview/llreflectionmapmanager.cpp

indra/newview/llreflectionmapmanager.h

indra/newview/llsurface.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llviewerregion.cpp

indra/newview/llviewerregion.h