diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-09-24 14:35:26 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-09-24 14:35:26 -0400 |
| commit | 77621dd3fc99f4fb1285a929e0b56b019f6b65c2 (patch) | |
| tree | 4de95909b29874f492206b090b2e233b8acb596c /indra/llimage | |
| parent | 8053bceaa0ccd6128536375c21cc3e9e19429efa (diff) | |
| parent | e241670694959833feaa0e667222b337095eb683 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vs2017
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimagebmp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagebmp.cpp b/indra/llimage/llimagebmp.cpp index 867b2bb47b..90b7272efa 100644 --- a/indra/llimage/llimagebmp.cpp +++ b/indra/llimage/llimagebmp.cpp @@ -181,7 +181,7 @@ bool LLImageBMP::updateData() } } else - if( 12 <= header.mSize && 64 <= header.mSize ) + if( 12 <= header.mSize && header.mSize <= 64 ) { setLastError("OS/2 2.x BMP files are not supported"); return false; |