diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
| commit | b81feb6ae7fd9d01b63999e53c5c231551d53200 (patch) | |
| tree | 527df9920d7d27000981fe726e5fbed9deccadbd /indra/integration_tests | |
| parent | 3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff) | |
| parent | 74dda61dfbccfd9ab5ef309aeb4b2b8c86e06cd6 (diff) | |
Merge of viewer-2-0 changes
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(); } |