diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-03-22 09:56:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-22 09:56:06 -0700 |
| commit | 49be01ef735b664aa975dd224840e2ee5ed5fe1b (patch) | |
| tree | d223cfe764e932049d4f9b9e0ff3286d4feba60d /indra/newview/llviewerobject.cpp | |
| parent | 84fe4a9bc0eae45c1b5aede238a0e0483f8edf28 (diff) | |
| parent | 6e6bac6b4025e01ee636b8490edbe09db2497722 (diff) | |
Merge pull request #131 from secondlife/brad/DRTVWR-559
Phase 2 of work on SL-18458 material override cache fixes
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 |