diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-14 09:28:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-14 09:28:08 +0100 |
| commit | d79351e689be5b0771b02843ad2ca1c35717394d (patch) | |
| tree | 98d06f8ff8d6324d07463d58804fdb4b59616cce /indra/newview/llvovolume.cpp | |
| parent | fcabd8a5e36f6bd28f74b6bd98c3bf64261eb2ab (diff) | |
| parent | 3ce4cecd681f3f95c7b1fe04db75c384d0b0854e (diff) | |
merge from viewer-public
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 15b04fa746..d9f5017a31 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; |