diff options
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llrender/llimagegl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp index c63d7ad..f99d4a9 100644 --- a/linden/indra/llrender/llimagegl.cpp +++ b/linden/indra/llrender/llimagegl.cpp | |||
| @@ -711,7 +711,9 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) | |||
| 711 | { | 711 | { |
| 712 | S32 bytes = w * h * mComponents; | 712 | S32 bytes = w * h * mComponents; |
| 713 | llassert(prev_mip_data); | 713 | llassert(prev_mip_data); |
| 714 | llassert(prev_mip_size == bytes*4); | 714 | llassert(prev_mip_size == (bytes*4)); |
| 715 | // Work around llassert() being compiled out and prev_mip_size not otherwise being used. | ||
| 716 | prev_mip_size = prev_mip_size + 0; | ||
| 715 | U8* new_data = new U8[bytes]; | 717 | U8* new_data = new U8[bytes]; |
| 716 | llassert_always(new_data); | 718 | llassert_always(new_data); |
| 717 | LLImageBase::generateMip(prev_mip_data, new_data, w, h, mComponents); | 719 | LLImageBase::generateMip(prev_mip_data, new_data, w, h, mComponents); |