diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-03-05 15:41:25 +0200 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-03-05 15:41:25 +0200 |
| commit | a8e1c2ed134b88b55b713ac53cd63cab4bb526b3 (patch) | |
| tree | 7949ef63bb34cf8c09e116269efa73d5d65bbd1a /indra/newview/skins/default/xui | |
| parent | baafdf216f482535d675eebcf4220510451d7332 (diff) | |
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
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_general.xml | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 1bbe9d80c0..4acfa42c23 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -171,27 +171,48 @@ width="100"> Rating: </text> - <combo_box + <icons_combo_box + follows="left|top" height="20" label="Moderate" layout="topleft" left_delta="100" name="access_combo" top_delta="0" - width="85"> - <combo_box.item + width="105"> + <icons_combo_box.drop_down_button + image_overlay="Parcel_M_Light" + image_overlay_alignment="left" + imgoverlay_label_space="3" + pad_left="3"/> + <icons_combo_box.item label="Adult" - name="Adult" - value="42" /> - <combo_box.item + value="42"> + <item.columns + halign="center" + type="icon" + value="Parcel_R_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item label="Moderate" - name="Mature" - value="21" /> - <combo_box.item + value="21"> + <item.columns + halign="center" + type="icon" + value="Parcel_M_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item label="General" - name="PG" - value="13" /> - </combo_box> + value="13"> + <item.columns + halign="center" + type="icon" + value="Parcel_PG_Light" + width="20"/> + </icons_combo_box.item> + </icons_combo_box> <button enabled="false" follows="left|top" |