diff options
| author | simon <none@none> | 2014-04-07 14:29:18 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-07 14:29:18 -0700 |
| commit | c9620e24d32a08ee79486d5ecc4085731432a0a6 (patch) | |
| tree | 397b622fc8c6a7f598409fe95d8e998bde965225 /indra/llimage/llimage.cpp | |
| parent | 565c41fdc2e2f8f9841cb41b446671563ea8d5e1 (diff) | |
| parent | 991636d57bd4a67e42a5425fe53bf66bf9cf8d07 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/llimage/llimage.cpp')
| -rwxr-xr-x | indra/llimage/llimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 55609deb2b..183620f9bc 100755 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1493,7 +1493,7 @@ void LLImageFormatted::sanityCheck() BOOL LLImageFormatted::copyData(U8 *data, S32 size) { - if ( data && getData() && ((data != getData()) || (size != getDataSize())) ) + if ( data && ((data != getData()) || (size != getDataSize())) ) { deleteData(); allocateData(size); |