diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-02-09 12:48:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 12:48:31 -0800 |
| commit | 1552ee3a5d72a1d6b2dc536d033d4c2d8f2e74ee (patch) | |
| tree | ea3da630b048f88eb9751bb559e61a021a94b2a8 /indra/newview/llvlcomposition.cpp | |
| parent | 4e5344ba76dd89373259e7286807ceba48bb5f82 (diff) | |
| parent | 2cbf4a15df940d92d38003d302e61fda14e1dc51 (diff) | |
Merge pull request #784 from secondlife/v-773
Fix RenderTerrainPBREnabled requiring restart and respect simulator feature PBRTerrainEnabled
Diffstat (limited to 'indra/newview/llvlcomposition.cpp')
| -rw-r--r-- | indra/newview/llvlcomposition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp index c092eb82f3..09b21e4e0a 100644 --- a/indra/newview/llvlcomposition.cpp +++ b/indra/newview/llvlcomposition.cpp @@ -159,7 +159,7 @@ bool LLTerrainMaterials::materialsReady(bool boost, bool strict) } #if 1 - static bool sRenderTerrainPBREnabled = gSavedSettings.get<bool>("RenderTerrainPBREnabled"); + static LLCachedControl<bool> sRenderTerrainPBREnabled(gSavedSettings, "RenderTerrainPBREnabled", false); static LLCachedControl<bool> sRenderTerrainPBRForce(gSavedSettings, "RenderTerrainPBRForce", false); if (sRenderTerrainPBREnabled && sRenderTerrainPBRForce) { |