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
commit696249e731bcc78aa30624b478b5ea0581456c63 (patch)
tree68d3b30a1cbb7461e092460a8f6b35607242ced5 /indra/newview
parent963214f624c963ad9ce80e81db294d15a049b851 (diff)
EXT-7327: FIXED: viewer crash in LLVOVolume::syncMediaData on Meshopotamia 1
(transplanted from 8be9afe40b24ddde1ad5f93e3a6554519acc7dc7)
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 b120f5abf3..396d716ae2 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1939,6 +1939,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;