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/llui/llui.cpp | |
| parent | 3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff) | |
| parent | 74dda61dfbccfd9ab5ef309aeb4b2b8c86e06cd6 (diff) | |
Merge of viewer-2-0 changes
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index f253857851..a82e6eb372 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; } @@ -1952,7 +1952,7 @@ namespace LLInitParam return fontp; } } - + // default to current value return mData.mValue; } |