diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-25 23:05:15 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-25 23:05:15 -0700 |
commit | 53c972a521cbb92c6c9390c41b250a41dc22cd5a (patch) | |
tree | f6fc9f14f3815a943b0f6655a3ec113f7ae8e9a9 /indra/llui/llui.cpp | |
parent | 4bc3b5f3db98f70faac9059616135886debb16a7 (diff) |
* Changes to enable differentiating between icon texture priority and other UI texture priority.
* Still need to only request smaller mip maps of icon textures
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; } |