diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-22 13:49:51 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-22 13:49:51 -0500 |
| commit | c4bc71766922c4f810e38f7dc91e521ed87fccf2 (patch) | |
| tree | 004aa7e33d6348049bce14da1f7b730f8eeede80 /indra/newview/llviewerobject.cpp | |
| parent | c97b6034eec9ce27a9d8f22db9a77b60e7e28779 (diff) | |
| parent | 49be01ef735b664aa975dd224840e2ee5ed5fe1b (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
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 |