diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-26 18:32:12 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-26 18:32:12 -0500 |
| commit | 8dbfa022778f2a7fcd5d2b527045724551279412 (patch) | |
| tree | 4e88cb98b66cff493887a93572ffc4c39c951a8e /indra/newview/llviewerdisplay.cpp | |
| parent | c7a16ef091409f55427f7cf0e9057130b47d2574 (diff) | |
| parent | 54ba56dbe995a3d215f85932c83948145a871ac4 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index e47ac8680a..20c9071052 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -866,6 +866,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) else { gPipeline.mScreen.bindTarget(); + if (LLPipeline::sUnderWaterRender && !gPipeline.canUseWindLightShaders()) + { + const LLColor4 &col = LLDrawPoolWater::sWaterFogColor; + glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f); + } gPipeline.mScreen.clear(); } |