diff options
| author | callum <none@none> | 2009-10-26 11:41:39 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-26 11:41:39 -0700 |
| commit | e84ff39e4c7c5b028a6b8b4f6dc5d37c525eb1c4 (patch) | |
| tree | 1caed5be096ccf7c55d344283865eaa75ea284e2 /indra/integration_tests | |
| parent | c5bd549b277ba2e0a1040715a974f32b67d9834b (diff) | |
| parent | bc6aa9445f15f2f5eeae6a697504cebd14564a92 (diff) | |
Merge
Diffstat (limited to 'indra/integration_tests')
| -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(); } |