diff options
author | James Cook <james@lindenlab.com> | 2010-03-29 16:55:22 -0700 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-03-29 16:55:22 -0700 |
commit | ecc2c726502448076295254714c0bfa8c0074f25 (patch) | |
tree | 6a9434c540f7b5ea7bca326df1a420e4a0a99cc4 /indra/newview/skins/default/xui/en/panel_edit_classified.xml | |
parent | d2f9e34598621f1dabad15025417efd6b81dddf0 (diff) | |
parent | ac103403160e87bb6b40ac3e032d077a3381da8e (diff) |
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_edit_classified.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_classified.xml | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index c1b352031f..62a364473c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -186,7 +186,7 @@ left="10" top_pad="5" name="set_to_curr_location_btn" - width="156" /> + width="200" /> <text follows="left|top" font.style="BOLD" @@ -217,25 +217,41 @@ top_pad="15" value="Content type:" width="250" /> - <combo_box - allow_text_entry="false" + <icons_combo_box follows="left|top" height="23" + label="General Content" + layout="topleft" left="10" name="content_type" top_pad="5" width="156"> - <combo_item + <icons_combo_box.drop_down_button + image_overlay="Parcel_PG_Light" + image_overlay_alignment="left" + imgoverlay_label_space="3" + pad_left="3"/> + <icons_combo_box.item + label="Moderate Content" name="mature_ci" value="Mature"> - Moderate Content - </combo_item> - <combo_item + <item.columns + halign="center" + type="icon" + value="Parcel_M_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item + label="General Content" name="pg_ci" value="PG"> - General Content - </combo_item> - </combo_box> + <item.columns + halign="center" + type="icon" + value="Parcel_PG_Light" + width="20"/> + </icons_combo_box.item> + </icons_combo_box> <text follows="left|top" font.style="BOLD" |