diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 15:02:58 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 15:02:58 +0200 |
commit | 3874823bd8a388979bad2d882d5d52bffb8d78da (patch) | |
tree | cb9713a19e8b9670cda7a5ec16b93f1e92b39584 /indra/llui/llbutton.h | |
parent | 2fed8d5182813e2077522bb5bbb2cc565b5c283d (diff) | |
parent | a872814de964ebcbf40e812f79319a13a54e2336 (diff) |
Merge from viewer-2-0
--HG--
branch : product-engine
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 6a0d8ef3d6..59b551a16d 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -216,6 +216,7 @@ public: 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; } + LLFontGL::HAlign getImageOverlayHAlign() const { return mImageOverlayAlignment; } void autoResize(); // resize with label of current btn state void resize(LLUIString label); // resize with label input |