diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/llui/llbutton.h | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index ba77220a7b..a638b5be49 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -124,7 +124,7 @@ public: void setDisabledSelectedLabelColor( const LLColor4& c ) { mDisabledSelectedLabelColor = c; } - void setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER); + void setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white); LLPointer<LLImageGL> getImageOverlay() { return mImageOverlay; } @@ -190,6 +190,7 @@ protected: LLPointer<LLImageGL> mImageOverlay; LLFontGL::HAlign mImageOverlayAlignment; + LLColor4 mImageOverlayColor; LLPointer<LLImageGL> mImageUnselected; LLUIString mUnselectedLabel; |