From 3f0b2307b59f6bc07e17182a1806866716304078 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Mon, 26 Oct 2009 10:39:36 -0700 Subject: Mac build fix; fix error about hidden functions in llui_libtest.cpp --- indra/integration_tests/llui_libtest/llui_libtest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/integration_tests/llui_libtest') diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp index 3631761c93..abd8f7dbde 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -84,12 +84,12 @@ class LLTexture ; class TestImageProvider : public LLImageProviderInterface { public: - /*virtual*/ LLPointer getUIImage(const std::string& name) + /*virtual*/ LLPointer getUIImage(const std::string& name, S32 priority) { return makeImage(); } - /*virtual*/ LLPointer getUIImageByID(const LLUUID& id) + /*virtual*/ LLPointer getUIImageByID(const LLUUID& id, S32 priority) { return makeImage(); } -- cgit v1.2.3