diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
| commit | 5797711cbdb553b39e6bc6ad7d9250e3208e5633 (patch) | |
| tree | 5071e15e3240c3e39fe42a26f4c45bd63ccb381a /indra/llrender/llimagegl.cpp | |
| parent | a0089c432ac9008f5d2f7ef2a332afa10c5a2615 (diff) | |
| parent | f9f5b538b21ae57f34009b36d4831d2a7000c20c (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 3e3a3095e3..b77f98d65e 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -905,9 +905,16 @@ BOOL LLImageGL::setImage(const U8* data_in, BOOL data_hasmips /* = FALSE */, S32 stop_glerror(); if (prev_mip_data) - delete[] prev_mip_data; + { + if (prev_mip_data != cur_mip_data) + delete[] prev_mip_data; + prev_mip_data = nullptr; + } if (cur_mip_data) + { delete[] cur_mip_data; + cur_mip_data = nullptr; + } mGLTextureCreated = false; return FALSE; |