diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-11 11:30:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-11 11:30:20 -0400 |
| commit | 4165f2eac869d7c94da15046823389049fac2231 (patch) | |
| tree | b5199feaa68f38bebdd21f22c65f9492cf8d14eb /indra/llrender | |
| parent | d47a436815a43e4c55fd9fc60aa3876a9d7f815f (diff) | |
| parent | 9b632f060b7b9dcd33858b5c31d538760d0666ae (diff) | |
merge latest integration repo changes
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 7de42219e4..06c73daf82 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -773,7 +773,10 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) { S32 bytes = w * h * mComponents; #ifdef SHOW_ASSERT + llassert(prev_mip_data); + llassert(cur_mip_size == bytes*4); #endif + U8* new_data = new U8[bytes]; #ifdef SHOW_ASSERT |