diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-03-21 13:40:00 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-03-21 13:43:40 -0700 |
| commit | 6e6bac6b4025e01ee636b8490edbe09db2497722 (patch) | |
| tree | 5f69bfecc9d79dc8b6b89fe0213ce7c7c991a477 /indra/newview/llviewerobject.cpp | |
| parent | b30cde2a05c5217018d8be7608f14bda8b66127a (diff) | |
Phase 2 of fix for SL-18458 material overrides not being cached properly
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index fd3c8de3e9..cb1694821d 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5375,6 +5375,12 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma return retval; } + if(src_mat->isFetching()) + { + // if still fetching, we need to wait until it is done and try again + return retval; + } + tep->setGLTFMaterialOverride(override_mat); // if override mat exists, we must also have a source mat |