From c5917d79c7bae428d7969fec866c7cb43216abce Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sat, 7 May 2011 21:49:48 -0500 Subject: [PATCH] Resetting media texture reference timer on update call to prevent purging from texture list while still in use. Keeping nullcheck just to be safe. (Broken video is preferable to a crash) --- indra/newview/llviewermedia.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 035bdebe1..b07bc6819 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -989,6 +989,12 @@ void LLViewerMediaImpl::updateImagesMediaStreams() LLViewerMediaTexture* placeholder_image = (LLViewerMediaTexture*)LLViewerTextureManager::findTexture( mTextureId ); + if(!placeholder_image) + { + return NULL; + } + placeholder_image->getLastReferencedTimer()->reset(); + if (mNeedsNewTexture || placeholder_image->getUseMipMaps() || ! placeholder_image->mIsMediaTexture