diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-18 17:44:32 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-18 17:44:32 -0400 |
| commit | 0b5c84df9406cdb731158ae4e07350156a3b528e (patch) | |
| tree | 1865f2a69ec74cc40904482d3d1373fc325f0efd /indra/newview | |
| parent | 529a88458ac774932a61e2e41bded3079520a73b (diff) | |
| parent | b9a8e7f4282f521fc382a8ac083eb2375183cfa9 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 6eaec0e7a1..79b235afae 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1766,7 +1766,16 @@ void LLVOAvatarSelf::onTimingLocalTexLoaded(BOOL success, LLViewerFetchedTexture void LLVOAvatarSelf::timingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata) { LLAvatarTexData *data = (LLAvatarTexData *)userdata; + if (!data) + { + return; + } + ETextureIndex index = data->mIndex; + if (index < 0 || index >= TEX_NUM_INDICES) + { + return; + } if (discard_level >=0 && discard_level <= MAX_DISCARD_LEVEL) // ignore discard level -1, as it means we have no data. { |