diff options
| author | James Cook <james@lindenlab.com> | 2010-05-19 16:41:13 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-19 16:41:13 -0700 |
| commit | 6e22cb75b434aa551d5b6133f505a629c397a93e (patch) | |
| tree | 876f54b4ef5e4a886e16970a13644a066da34316 /indra/newview/llvovolume.cpp | |
| parent | 2c87657659eb6cdd0a0f135b78d290ed180cc21d (diff) | |
| parent | ac17ec0c287246dbb00d21a6b4994949eac69737 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 5 |
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; |