diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-16 15:25:25 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-16 15:25:25 -0400 |
| commit | 78d985c154b0d71064b89891f5b2005e48c300ce (patch) | |
| tree | c43bc6be58ec9b30f0f4dfaa6c027736fb331582 /indra/newview/llviewertexture.cpp | |
| parent | 6c2a278c3dbd9d0660be5e9f6ec1c756af7cb992 (diff) | |
| parent | a3cbd41543258818589dd0e368c68d2dc62b3398 (diff) | |
Merge branch 'main' into release/luau-scripting
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 56bba51692..04ef441a69 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -3505,7 +3505,10 @@ void LLViewerMediaTexture::addFace(U32 ch, LLFace* facep) if(te && te->getID().notNull()) //should have a texture { - LL_ERRS() << "The face does not have a valid texture before media texture." << LL_ENDL; + LL_WARNS_ONCE() << "The face's texture " << te->getID() << " is not valid. Face must have a valid texture before media texture." << LL_ENDL; + // This might break the object, but it likely isn't a 'recoverable' situation. + LLViewerFetchedTexture* tex = LLViewerTextureManager::getFetchedTexture(te->getID()); + mTextureList.push_back(tex); } } |