diff options
| author | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
| commit | c07901e29ed545bbb02e3bddf148fe1104b94e9f (patch) | |
| tree | f1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/llimage | |
| parent | Second Life viewer sources 1.15.0.2 (diff) | |
| download | meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2 meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz | |
Second Life viewer sources 1.15.1.3
Diffstat (limited to 'linden/indra/llimage')
| -rw-r--r-- | linden/indra/llimage/llimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp index a7d8bdd..5175314 100644 --- a/linden/indra/llimage/llimage.cpp +++ b/linden/indra/llimage/llimage.cpp | |||
| @@ -1422,7 +1422,7 @@ void LLImageFormatted::sanityCheck() | |||
| 1422 | 1422 | ||
| 1423 | BOOL LLImageFormatted::copyData(U8 *data, S32 size) | 1423 | BOOL LLImageFormatted::copyData(U8 *data, S32 size) |
| 1424 | { | 1424 | { |
| 1425 | if ( (data && data != getData()) || (size != getDataSize()) ) | 1425 | if ( data && ((data != getData()) || (size != getDataSize())) ) |
| 1426 | { | 1426 | { |
| 1427 | deleteData(); | 1427 | deleteData(); |
| 1428 | allocateData(size); | 1428 | allocateData(size); |