From a8e1c2ed134b88b55b713ac53cd63cab4bb526b3 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Fri, 5 Mar 2010 15:41:25 +0200 Subject: Implemented (EXT-4705) Show maturity icon on Region/Estate tab. - Added LLIconsComboBox class - a combobox with icons for maturity ratings. - Fixed scroll list maximum width calculation. The width was calculated based on text value width for non-text columns. - Added image overlay alignment getter method to LLButton. --HG-- branch : product-engine --- indra/llui/llbutton.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llui/llbutton.h') 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 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 -- cgit v1.2.3