summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorMichael Pohoreski <ptolemy@lindenlab.com>2019-11-20 17:10:22 -0800
committerMichael Pohoreski <ptolemy@lindenlab.com>2019-11-20 17:10:22 -0800
commit4b205db468fd371dfe1bb30bb887e2ccbd7044ec (patch)
tree6d83efd5ebc0c2a462f33f1b385c5b415a93cb49 /indra/newview/llviewertexture.cpp
parent18eb8ac90ce409ba620f6fe8ff487e6195d9c3eb (diff)
parent24920de799c8e2dd26854923c7a10fc4a551dd5d (diff)
Merged lindenlab/viewer-eep into default
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index af18c8ea03..f5f9d0d3cc 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -3459,7 +3459,7 @@ void LLViewerMediaTexture::setMediaImpl()
{
if(!mMediaImplp)
{
- mMediaImplp = LLViewerMedia::getMediaImplFromTextureID(mID);
+ mMediaImplp = LLViewerMedia::getInstance()->getMediaImplFromTextureID(mID);
}
}
@@ -3680,9 +3680,9 @@ void LLViewerMediaTexture::removeFace(U32 ch, LLFace* facep)
}
}
- if(te && te->getID().notNull()) //should have a texture
+ if(te && te->getID().notNull()) //should have a texture but none found
{
- LL_ERRS() << "mTextureList texture reference number is corrupted." << LL_ENDL;
+ LL_ERRS() << "mTextureList texture reference number is corrupted. Texture id: " << te->getID() << " List size: " << (U32)mTextureList.size() << LL_ENDL;
}
}