summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_region_general.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-05 16:30:32 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-05 16:30:32 +0000
commitefd51b6c027b6221bbd17f00be6db0f3988a1af4 (patch)
treea65a84c6d62337be92ae142db695067d7b29b3b6 /indra/newview/skins/default/xui/en/panel_region_general.xml
parentd33b6a18872a652808afe3aa9ae40de6adaa3004 (diff)
parent2433de3fac1a07a94e3c031b4528fee90a5fa7d2 (diff)
PE merge.
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_region_general.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_general.xml45
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"