diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 08:11:13 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 08:11:13 -0700 |
| commit | a0998157746d0429d5b8e75fea973c433dcfd3c4 (patch) | |
| tree | dd827016316a5e0fece141013e8018cd7f260268 /indra/llrender | |
| parent | e413f4b335a2f4f5a1ca151c8ab67324a72ebaee (diff) | |
| parent | 9b632f060b7b9dcd33858b5c31d538760d0666ae (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 09bd0b3cdc..38764eba23 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -624,7 +624,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) { is_compressed = true; } - + if (mUseMipMaps) @@ -772,6 +772,10 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) else { 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 |