diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-12 17:34:13 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-12 17:44:40 +0200 |
| commit | 7ce17542d46ff7cb6b88d33d4cad5ba4808c6c58 (patch) | |
| tree | a29ce0a5bab1803b186fff9649954d68de78c7c0 /indra/newview/llappviewer.cpp | |
| parent | 0fa3d7705fb6a42410d1578b1fab5b7952a59e7c (diff) | |
DRTVWR-528 Reverting multiple commits due to moving them into D546 branch
This reverts commits
9b5b2eac82b1f423daec463b3d55d0f3d3979bbc SL-15933
53c0144dd272470172591b967a84beaa4019b728 SL-11687
492ea7c3a03d5ef0d3679b873a44c08baaced0f1 SL-16056
b854eceee3a867d64b20de18d6b7ce91b33abed0 SL-15391
921c3f5f69c90b5924d2f4bbbd32455f8c9c8173 SL-13561
639acb6ff7495a6840d437dd8473172ec03e200a SL-15333
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 4a33563f3f..87f22a98c1 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -610,7 +610,7 @@ static void settings_modify() LLRenderTarget::sUseFBO = gSavedSettings.getBOOL("RenderDeferred"); LLPipeline::sRenderTransparentWater = gSavedSettings.getBOOL("RenderTransparentWater"); LLPipeline::sRenderBump = gSavedSettings.getBOOL("RenderObjectBump"); - LLPipeline::sRenderDeferred = LLPipeline::sRenderBump && gSavedSettings.getBOOL("RenderDeferred"); + LLPipeline::sRenderDeferred = LLPipeline::sRenderTransparentWater && LLPipeline::sRenderBump && gSavedSettings.getBOOL("RenderDeferred"); LLVOSurfacePatch::sLODFactor = gSavedSettings.getF32("RenderTerrainLODFactor"); LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4] gDebugGL = gSavedSettings.getBOOL("RenderDebugGL") || gDebugSession; |