diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-12 10:13:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-12 10:13:24 -0400 |
| commit | d8931c9269a90cd01f6f6ff4de83b8fb41df11d3 (patch) | |
| tree | a048235823e3dd11e6a4e335ee19b453b6b6e4b0 /indra/llimage | |
| parent | 24d405048fa0b9b26d1cb1d9e8ea8b113b867a14 (diff) | |
| parent | 87f496cf7c1c71510e4cb995661f8da5691746da (diff) | |
DRTVWR-588: Merge 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimagedimensionsinfo.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llimage/llimagedimensionsinfo.cpp b/indra/llimage/llimagedimensionsinfo.cpp index 5756ddb32b..9dd69ff132 100644 --- a/indra/llimage/llimagedimensionsinfo.cpp +++ b/indra/llimage/llimagedimensionsinfo.cpp @@ -50,6 +50,7 @@ bool LLImageDimensionsInfo::load(const std::string& src_filename,U32 codec) if (file_size == 0) { + mWarning = "texture_load_empty_file"; setLastError("File is empty",src_filename); return false; } @@ -90,7 +91,7 @@ bool LLImageDimensionsInfo::getImageDimensionsBmp() if (signature[0] != 'B' || signature[1] != 'M') { LL_WARNS() << "Not a BMP" << LL_ENDL; - mWarning = "IncorrectFormat"; + mWarning = "texture_load_format_error"; return false; } @@ -141,7 +142,7 @@ bool LLImageDimensionsInfo::getImageDimensionsPng() if (memcmp(signature, png_magic, PNG_MAGIC_SIZE) != 0) { LL_WARNS() << "Not a PNG" << LL_ENDL; - mWarning = "IncorrectFormat"; + mWarning = "texture_load_format_error"; return false; } @@ -185,7 +186,7 @@ bool LLImageDimensionsInfo::getImageDimensionsJpeg() if (memcmp(signature, jpeg_magic, JPEG_MAGIC_SIZE) != 0) { LL_WARNS() << "Not a JPEG" << LL_ENDL; - mWarning = "IncorrectFormat"; + mWarning = "texture_load_format_error"; return false; } fseek(fp, 0, SEEK_SET); // go back to start of the file |