summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorVir Linden <60274682+vir-linden@users.noreply.github.com>2024-05-01 16:32:46 +0100
committerVir Linden <60274682+vir-linden@users.noreply.github.com>2024-05-01 16:32:46 +0100
commitab8547098560a1dbf0ad7211fe8d0fd05c56cc81 (patch)
tree107c7845961e59204230504a1e41e112f53cffee /indra
parenta3602d660c89a10126946d9c789e454fbfbc34bd (diff)
parentf886a438ed11468a90ecca9ba8046a6719f0402c (diff)
Merge branch 'main' into project/channel_by_branch
Diffstat (limited to 'indra')
-rw-r--r--indra/llimage/tests/llimageworker_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index 0a97b739b0..ffcd7d257f 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -98,7 +98,7 @@ namespace tut
done = res;
*done = false;
}
- virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux)
+ virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux, U32)
{
*done = true;
}