diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-14 08:50:04 +0300 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:35:28 -0400 |
commit | 33ad8db77584c66496f261a1cfd9aa535462a003 (patch) | |
tree | 21c6f88d36160129063c63281a45f3beeb6fa411 /indra/llimage | |
parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) |
#1457 Fix the tests on mac
(cherry picked from commit 82d713782529074b03720833038cb0df2b8bcffd)
Diffstat (limited to 'indra/llimage')
-rw-r--r-- | indra/llimage/tests/llimageworker_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp index 49fc1afd82..2568adf89e 100644 --- a/indra/llimage/tests/llimageworker_test.cpp +++ b/indra/llimage/tests/llimageworker_test.cpp @@ -68,6 +68,7 @@ U8* LLImageRaw::allocateData(S32 size) { return NULL; } U8* LLImageRaw::reallocateData(S32 size) { return NULL; } const U8* LLImageBase::getData() const { return NULL; } U8* LLImageBase::getData() { return NULL; } +const std::string& LLImage::getLastThreadError() { static std::string msg; return msg; } // End Stubbing // ------------------------------------------------------------------------------------------- @@ -98,7 +99,7 @@ namespace tut done = res; *done = false; } - virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux, U32) + virtual void completed(bool success, const std::string& error_message, LLImageRaw* raw, LLImageRaw* aux, U32 request_id) { *done = true; } |