diff options
| author | angela <angela@lindenlab.com> | 2009-10-27 13:26:50 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-27 13:26:50 +0800 |
| commit | 773ce219c6317dc753369fa280d5d7f6c4b23550 (patch) | |
| tree | cbfc416e124efa20726d1db10a3324732cafb269 /indra/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | f60314f22758daa22d096f2166367258d761d8b4 (diff) | |
| parent | 4767b546e6917ab4b2561553cf617d577fe998ff (diff) | |
merge
Diffstat (limited to 'indra/integration_tests/llui_libtest/llui_libtest.cpp')
| -rw-r--r-- | indra/integration_tests/llui_libtest/llui_libtest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<LLUIImage> getUIImage(const std::string& name) + /*virtual*/ LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority) { return makeImage(); } - /*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id) + /*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority) { return makeImage(); } |