summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-03-09 12:16:44 -0800
committerRichard Linden <none@none>2010-03-09 12:16:44 -0800
commitb51515100c75b737c144834d8efd594c3fe9ae69 (patch)
tree2254503b48a169162d382d7e2183baa8d8578bc4 /indra/newview
parentf1a58bd14ec774047c0cc5b9b65883cc6d03405a (diff)
rolled back changeset 5fbab7aa32ef to fix EXT-6269
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_general.xml45
1 files changed, 12 insertions, 33 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 4acfa42c23..1bbe9d80c0 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -171,48 +171,27 @@
width="100">
Rating:
</text>
- <icons_combo_box
- follows="left|top"
+ <combo_box
height="20"
label="Moderate"
layout="topleft"
left_delta="100"
name="access_combo"
top_delta="0"
- 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
+ width="85">
+ <combo_box.item
label="Adult"
- value="42">
- <item.columns
- halign="center"
- type="icon"
- value="Parcel_R_Light"
- width="20"/>
- </icons_combo_box.item>
- <icons_combo_box.item
+ name="Adult"
+ value="42" />
+ <combo_box.item
label="Moderate"
- value="21">
- <item.columns
- halign="center"
- type="icon"
- value="Parcel_M_Light"
- width="20"/>
- </icons_combo_box.item>
- <icons_combo_box.item
+ name="Mature"
+ value="21" />
+ <combo_box.item
label="General"
- value="13">
- <item.columns
- halign="center"
- type="icon"
- value="Parcel_PG_Light"
- width="20"/>
- </icons_combo_box.item>
- </icons_combo_box>
+ name="PG"
+ value="13" />
+ </combo_box>
<button
enabled="false"
follows="left|top"