diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 16:10:25 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 16:10:25 -0700 |
| commit | f2455ccaafec1b583d714b119dd68ec8b4165519 (patch) | |
| tree | b936569bf9d72742ef3af82f4aa8c4097f20ad8f /indra/llrender | |
| parent | d2f71df15f14fe0f7e17f962d39d19dd571fc530 (diff) | |
Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
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 e0fe9e783d..bcbd155423 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 |