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/llui/llui.cpp | |
| parent | f60314f22758daa22d096f2166367258d761d8b4 (diff) | |
| parent | 4767b546e6917ab4b2561553cf617d577fe998ff (diff) | |
merge
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index da9384f876..48504a1e54 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1807,11 +1807,11 @@ void LLUI::glRectToScreen(const LLRect& gl, LLRect *screen) } //static -LLPointer<LLUIImage> LLUI::getUIImageByID(const LLUUID& image_id) +LLPointer<LLUIImage> LLUI::getUIImageByID(const LLUUID& image_id, S32 priority) { if (sImageProvider) { - return sImageProvider->getUIImageByID(image_id); + return sImageProvider->getUIImageByID(image_id, priority); } else { @@ -1820,10 +1820,10 @@ LLPointer<LLUIImage> LLUI::getUIImageByID(const LLUUID& image_id) } //static -LLPointer<LLUIImage> LLUI::getUIImage(const std::string& name) +LLPointer<LLUIImage> LLUI::getUIImage(const std::string& name, S32 priority) { if (!name.empty() && sImageProvider) - return sImageProvider->getUIImage(name); + return sImageProvider->getUIImage(name, priority); else return NULL; } |