summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-05-13 14:43:24 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-05-13 14:43:24 -0600
commit0f7277b98ba25043bef03f2636b9b2285159bc75 (patch)
tree5390cda06c9c50eb230265215c66347fc3086719 /indra/newview
parentc0a78f91066dc8b5200fadf4fe81e4f2d375a112 (diff)
EXT-7327: FIXED: viewer crash in LLVOVolume::syncMediaData on Meshopotamia 1
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvovolume.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 594435475f..d6453111d7 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1856,6 +1856,11 @@ void LLVOVolume::syncMediaData(S32 texture_index, const LLSD &media_data, bool m
}
LLTextureEntry *te = getTE(texture_index);
+ if(!te)
+ {
+ return ;
+ }
+
LL_DEBUGS("MediaOnAPrim") << "BEFORE: texture_index = " << texture_index
<< " hasMedia = " << te->hasMedia() << " : "
<< ((NULL == te->getMediaData()) ? "NULL MEDIA DATA" : ll_pretty_print_sd(te->getMediaData()->asLLSD())) << llendl;