diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-09-03 19:09:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-03 19:09:48 +0300 |
| commit | 5593cde0e85d4d4b06efacffb6f00ed2fadb188a (patch) | |
| tree | 185c46ee176b3f4196eaeb0d56e1d72931e72966 /indra/newview | |
| parent | 3e4f112c03d4fb9f5483d4acf18f0654740ebf45 (diff) | |
| parent | 46f325b7db41ac855d35e3ab50ad915dd075de1e (diff) | |
Merge pull request #4625 from secondlife/andreyk/viewer_4587
#4587 Shaders sometimes do not match the shader settings
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index a0a9906724..a9c58d5a06 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -545,7 +545,11 @@ void LLViewerShaderMgr::setShaders() gSavedSettings.setString("RenderShaderCacheVersion", current_cache_version.asString()); } - initShaderCache(shader_cache_enabled, old_cache_version, current_cache_version); + initShaderCache( + shader_cache_enabled, + old_cache_version, + current_cache_version, + LLAppViewer::instance()->isSecondInstance()); } static LLCachedControl<U32> max_texture_index(gSavedSettings, "RenderMaxTextureIndex", 16); @@ -703,7 +707,10 @@ void LLViewerShaderMgr::setShaders() loaded = loaded && loadShadersDeferred(); llassert(loaded); - persistShaderCacheMetadata(); + if (!LLAppViewer::instance()->isSecondInstance()) + { + persistShaderCacheMetadata(); + } if (gViewerWindow) { |