summaryrefslogtreecommitdiff
path: root/indra/llui/llui.h
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-25 23:05:15 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-25 23:05:15 -0700
commit53c972a521cbb92c6c9390c41b250a41dc22cd5a (patch)
treef6fc9f14f3815a943b0f6655a3ec113f7ae8e9a9 /indra/llui/llui.h
parent4bc3b5f3db98f70faac9059616135886debb16a7 (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.h')
-rw-r--r--indra/llui/llui.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 6ab78ab3cd..efb1b0a36f 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -195,8 +195,8 @@ public:
static void getMousePositionLocal(const LLView* viewp, S32 *x, S32 *y);
static void setScaleFactor(const LLVector2& scale_factor);
static void setLineWidth(F32 width);
- static LLPointer<LLUIImage> getUIImageByID(const LLUUID& image_id);
- static LLPointer<LLUIImage> getUIImage(const std::string& name);
+ static LLPointer<LLUIImage> getUIImageByID(const LLUUID& image_id, S32 priority = 0);
+ static LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority = 0);
static LLVector2 getWindowSize();
static void screenPointToGL(S32 screen_x, S32 screen_y, S32 *gl_x, S32 *gl_y);
static void glPointToScreen(S32 gl_x, S32 gl_y, S32 *screen_x, S32 *screen_y);
@@ -241,8 +241,8 @@ protected:
LLImageProviderInterface() {};
virtual ~LLImageProviderInterface() {};
public:
- virtual LLPointer<LLUIImage> getUIImage(const std::string& name) = 0;
- virtual LLPointer<LLUIImage> getUIImageByID(const LLUUID& id) = 0;
+ virtual LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority) = 0;
+ virtual LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority) = 0;
virtual void cleanUp() = 0;
};