diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 10:51:58 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 10:51:58 -0800 |
| commit | 3889d4329962cc497bccbc8bbe9e6678ab3c9e6c (patch) | |
| tree | da02c07350e9c4def5013376dbbc382a3e49d57e /indra/llui/llbutton.cpp | |
| parent | fa891c062ef66410123c66de1ef67b7dcef327db (diff) | |
| parent | 09e9cdeb2e7e979ea1d4898fa7c2d40e8ebc52b2 (diff) | |
PE merge.
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index e9f6288f44..9ce8ce8d55 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -1022,6 +1022,20 @@ void LLButton::setImageOverlay(const std::string& image_name, LLFontGL::HAlign a } } +void LLButton::setImageOverlay(const LLUUID& image_id, LLFontGL::HAlign alignment, const LLColor4& color) +{ + if (image_id.isNull()) + { + mImageOverlay = NULL; + } + else + { + mImageOverlay = LLUI::getUIImageByID(image_id); + mImageOverlayAlignment = alignment; + mImageOverlayColor = color; + } +} + void LLButton::onMouseCaptureLost() { resetMouseDownTimer(); |