diff options
| author | Nicky Dasmijn <sl.nicky.ml@googlemail.com> | 2022-03-02 02:39:07 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2022-03-02 02:39:07 +0000 |
| commit | 3e77876ac44f60b7bc23e5618b56b8c9df4a2709 (patch) | |
| tree | 0af6f51986acc8f746be475b06646cbf11df430c /indra/newview | |
| parent | fa9d4927f45f868573d95d670652c561d50a0de7 (diff) | |
| parent | df00e8a0b2e9cdd9700f51e964d040c19a4bf2ec (diff) | |
Merged in nd_cleanup_v2 (pull request #891)
Remove all boost, fix calling functions on nullptrs, initialize vars
Approved-by: Maxim Nikolenko
Approved-by: Nat Linden
Approved-by: Andrey Lihatskiy
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 37344056e1..4709094591 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1263,7 +1263,7 @@ BOOL LLViewerTextureList::createUploadFile(const std::string& filename, LLPointer<LLImageFormatted> image = LLImageFormatted::createFromType(codec); if (image.isNull()) { - image->setLastError("Couldn't open the image to be uploaded."); + LL_WARNS() << "Couldn't open the image to be uploaded." << LL_ENDL; return FALSE; } if (!image->load(filename)) |