NORSPEC-291 WIP materials underwater w and wo alpha, water fog color broken, no refl, no water dis

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index e6718ca618..d9fd171b4e 100755
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -893,7 +893,15 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			if (LLPipeline::sRenderDeferred)
 			{
 				gPipeline.mDeferredScreen.bindTarget();
-				glClearColor(1,0,1,1);
+				if (LLPipeline::sUnderWaterRender)
+				{
+					const LLColor4 &col = LLDrawPoolWater::sWaterFogColor;
+					glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f);
+				}
+				else
+				{
+					glClearColor(1,0,1,1);
+				}				
 				gPipeline.mDeferredScreen.clear();
 			}
 			else