diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:29:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:29:47 +0300 |
| commit | 5118ba7adfc6f49f5b23694507dc7ceb8365b969 (patch) | |
| tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /indra/llimage/llimagedimensionsinfo.h | |
| parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
| parent | 84dfe55810815e8c274044cea5c81aaed89a787f (diff) | |
Merge pull request #1179 from secondlife/marchcat/y-merge
Release (Maint W) -> Maint YZ 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; |