diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-24 16:26:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-24 16:26:42 -0500 |
| commit | 5c86ec6a6130bef9348d6155c6a7404914c20418 (patch) | |
| tree | bcc13446fda77a997065216d7d36fcb3ae8c28ac /indra/newview/llviewerobject.cpp | |
| parent | 554bc6f6b3da2f0949e92e92f09804c8f65b07ca (diff) | |
SL-18105 Add mechanism for applying overrides that were received before associated ViewerObject was ready to receive them.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 603dcc4fa7..ac519970b7 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -247,6 +247,7 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco LL_WARNS() << "Unknown object pcode " << (S32)pcode << LL_ENDL; res = NULL; break; } + return res; } @@ -5324,8 +5325,8 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma LLTextureEntry* tep = getTE(te); if (!tep) - { - LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL; + { // this could happen if the object is not fully formed yet + // returning TEM_CHANGE_NONE here signals to LLGLTFMaterialList to queue the override for later return retval; } |