diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:30:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:30:37 +0300 |
| commit | 5af93ff0d53606db3dca727a8cd1b73d7c37d70b (patch) | |
| tree | 2deaa98bcd99fd2860da758a92816c3bdb838acd /indra/llimage/llimagedimensionsinfo.h | |
| parent | a902138de15067a86a6aeb02fdabd094873da0b2 (diff) | |
| parent | 0acee937f55e6d1a198be2549d5cb55a0403dd4d (diff) | |
Merge pull request #1177 from secondlife/marchcat/c-merge
Release (Maint W) -> Maint C merge
Diffstat (limited to 'indra/llimage/llimagedimensionsinfo.h')
| -rw-r--r-- | indra/llimage/llimagedimensionsinfo.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llimage/llimagedimensionsinfo.h b/indra/llimage/llimagedimensionsinfo.h index 8f716c5d02..ade283bb85 100644 --- a/indra/llimage/llimagedimensionsinfo.h +++ b/indra/llimage/llimagedimensionsinfo.h @@ -55,6 +55,12 @@ public: { return mLastError; } + + const std::string& getWarningName() + { + return mWarning; + } + protected: void clean() @@ -129,6 +135,7 @@ protected: std::string mSrcFilename; std::string mLastError; + std::string mWarning; U8* mData; |