summaryrefslogtreecommitdiff
path: root/indra/llui/lliconctrl.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-04-20 11:23:39 -0400
committerLoren Shih <seraph@lindenlab.com>2011-04-20 11:23:39 -0400
commit38306a2bbbcaaa0825db88aab39f7d10943f9af3 (patch)
treeab5f360c6537510303da006a7678124c3134613b /indra/llui/lliconctrl.h
parent6715603b6a991f822274b000e5d8fb9b8d405464 (diff)
parentda7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff)
automated merge viewer-pre-beta -> seraph-viewer-pre-beta
Diffstat (limited to 'indra/llui/lliconctrl.h')
-rw-r--r--indra/llui/lliconctrl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index e9bdab2d47..669e126266 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -69,6 +69,7 @@ public:
void setColor(const LLColor4& color) { mColor = color; }
void setImage(LLPointer<LLUIImage> image) { mImagep = image; }
+ const LLPointer<LLUIImage> getImage() { return mImagep; }
private:
void setIconImageDrawSize() ;