diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 15:18:08 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 15:18:08 -0800 |
commit | 9e0920df2c8ada63397ea6e439b02ee5b40d1bf6 (patch) | |
tree | 26f6af13d1dcd9d02c48bd7897b3604481f3734c /indra/llui/llbutton.h | |
parent | b96e52b72ab598a57d981c850b5f14b1ac406325 (diff) | |
parent | 4cf79224d099c4fc8bdfd9617e95a776d5a028d4 (diff) |
Merge from v2 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 |