diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-12-16 11:14:14 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-12-16 11:14:14 -0700 |
| commit | 0fd7d20949a3f471e7ebb78731612013dfad7b0d (patch) | |
| tree | ac2ec5ff8262e2cf1ffbbc76990a869f00990d6f /indra/newview/llviewercontrol.cpp | |
| parent | bebdeb430ba72ab1c7eddc2f10d43b36f1992827 (diff) | |
DRTVWR-546 fix sUseFBO merge errors
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index a4f8963dc3..e53f988c6e 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -465,9 +465,7 @@ static bool handleRenderDeferredChanged(const LLSD& newvalue) // static bool handleRenderBumpChanged(const LLSD& newval) { - LLRenderTarget::sUseFBO = newval.asBoolean() - && gSavedSettings.getBOOL("RenderTransparentWater") - && gSavedSettings.getBOOL("RenderDeferred"); + LLRenderTarget::sUseFBO = newval.asBoolean() && gSavedSettings.getBOOL("RenderDeferred"); if (gPipeline.isInit()) { gPipeline.updateRenderBump(); |