diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-12-16 10:50:49 -0700 | 
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-12-16 10:50:49 -0700 | 
| commit | bebdeb430ba72ab1c7eddc2f10d43b36f1992827 (patch) | |
| tree | c138da619f8d99893c5b910da35a61381ea23dcc /indra/newview | |
| parent | 752bcc16fc57070a06a572eae2fce18fc181136d (diff) | |
DRTVWR-546 fix dead setting merge error
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 1 | 
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 41c477f678..a4f8963dc3 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -467,7 +467,6 @@ static bool handleRenderBumpChanged(const LLSD& newval)  {      LLRenderTarget::sUseFBO = newval.asBoolean()                                   && gSavedSettings.getBOOL("RenderTransparentWater")  -                                && gSavedSettings.getBOOL("RenderAvatarVP")                                  && gSavedSettings.getBOOL("RenderDeferred");  	if (gPipeline.isInit())  	{  | 
