summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-07-11 16:21:23 -0700
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-07-11 16:21:23 -0700
commitfbf3d8b78137a5229ccfabd1e42a0712d92b061f (patch)
tree54be4abc8d7ca079be78f65d9f9b39a0da54d009 /indra/newview/llviewerdisplay.cpp
parentd7856f09999206be489183f52ae2f33020a68538 (diff)
NORSPEC-291 WIP materials underwater with haze, reflection broken, water dist broken
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rwxr-xr-xindra/newview/llviewerdisplay.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index d9fd171b4e..bbebeea3e0 100755
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -893,15 +893,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
if (LLPipeline::sRenderDeferred)
{
gPipeline.mDeferredScreen.bindTarget();
- 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);
- }
+ glClearColor(1,0,1,1);
gPipeline.mDeferredScreen.clear();
}
else
@@ -1631,3 +1623,4 @@ void display_cleanup()
{
gDisconnectedImagep = NULL;
}
+