diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-07-12 22:03:50 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-07-12 22:03:50 +0300 |
| commit | e9cd2b320ea2ecaab88e4904f7c81746ea617fea (patch) | |
| tree | 059195c02bd4fa57705e04f2ff1214e476a56495 | |
| parent | 43de9f202e9c09bc46e9b4e51ac87425b99b9a55 (diff) | |
Post-merge conflict fix
| -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 b26b72c2ed..92a5fe5893 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -572,7 +572,7 @@ static void settings_modify() LLRenderTarget::sUseFBO = LLPipeline::sRenderDeferred; LLVOSurfacePatch::sLODFactor = gSavedSettings.getF32("RenderTerrainLODFactor"); LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4] - gDebugGL = gSavedSettings.getBOOL("RenderDebugGL") || gDebugSession; + gDebugGL = gDebugGLSession || gDebugSession; gDebugPipeline = gSavedSettings.getBOOL("RenderDebugPipeline"); } |