diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 14:12:18 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 14:12:18 -0800 |
| commit | 0ac14158bcec40e65fb26d2fea7555ede1e2ca94 (patch) | |
| tree | bacf3b28ac4de7f69da67d7616923dafe92b0d49 /indra/llui/llbutton.h | |
| parent | 92cef0426df15c0e661fa795e6b00214f381dd05 (diff) | |
| parent | ab0c9c6754836cb26a520d0a9b2d7bbdd13a5f32 (diff) | |
automated merge from trunk
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 5e28b8cdff..cd149e3113 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -200,6 +200,7 @@ public: void setDisabledSelectedLabelColor( const LLColor4& c ) { mDisabledSelectedLabelColor = c; } void setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white); + void setImageOverlay(const LLUUID& image_id, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white); LLPointer<LLUIImage> getImageOverlay() { return mImageOverlay; } void autoResize(); // resize with label of current btn state |