diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-04 19:01:31 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-04 19:01:31 -0500 |
commit | 16efeb85817cce82e594cf8482f5e52385a59ad1 (patch) | |
tree | 85878d4b882faa0157d1be26dc6e0e28d582c218 /indra/newview/skins/default/xui/en/panel_region_general.xml | |
parent | f017058345ba1bc2682051017d3f9c0d6ea3db72 (diff) | |
parent | 938c51d2a483962556ee183c24e2b3f635f2c56b (diff) |
merge
--HG--
branch : avatar-pipeline
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.xml | 6 |
1 files changed, 3 insertions, 3 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 42c6319699..79d8f3a0ee 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -171,7 +171,7 @@ </text> <combo_box height="20" - label="Mature" + label="Moderate" layout="topleft" left_delta="100" name="access_combo" @@ -182,11 +182,11 @@ name="Adult" value="42" /> <combo_box.item - label="Mature" + label="Moderate" name="Mature" value="21" /> <combo_box.item - label="PG" + label="General" name="PG" value="13" /> </combo_box> |