diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/llui/lliconctrl.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/llui/lliconctrl.h')
| -rw-r--r-- | indra/llui/lliconctrl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index 6535c0bb0b..33429c580e 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -51,14 +51,14 @@ public: LLIconCtrl(const LLString& name, const LLRect &rect, const LLUUID &image_id); LLIconCtrl(const LLString& name, const LLRect &rect, const LLString &image_name); virtual ~LLIconCtrl(); - virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_ICON; } - virtual LLString getWidgetTag() const { return LL_ICON_CTRL_TAG; } // llview overrides virtual void draw(); - void setImage(const LLUUID &image_id); + void setImage(const LLString& image_name); + void setImage(const LLUUID& image_name); const LLUUID &getImage() const { return mImageID; } + LLString getImageName() const { return mImageName; } // Takes a UUID, wraps get/setImage virtual void setValue(const LLSD& value ); |