diff options
author | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
---|---|---|
committer | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
commit | 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 (patch) | |
tree | 3136e0a32cdcb1d55a4c3a5a67791ca128d947a5 /indra/newview/skins/default/xui/es/panel_region_general.xml | |
parent | 93cf3d89e51835dd2f61c32b16191ab724528055 (diff) |
svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
Diffstat (limited to 'indra/newview/skins/default/xui/es/panel_region_general.xml')
-rw-r--r-- | indra/newview/skins/default/xui/es/panel_region_general.xml | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml index 9ff7c97fc7..64169e427b 100644 --- a/indra/newview/skins/default/xui/es/panel_region_general.xml +++ b/indra/newview/skins/default/xui/es/panel_region_general.xml @@ -12,6 +12,12 @@ <text name="version_channel_text"> desconocida </text> + <text name="region_type_lbl"> + Tipo: + </text> + <text name="region_type"> + desconocido + </text> <check_box label="No permitir modificar el terreno" name="block_terraform_check"/> <button label="?" name="terraform_help"/> <check_box label="Prohibir volar" name="block_fly_check"/> @@ -33,10 +39,17 @@ <text label="Calificación" name="access_text"> Calificación: </text> - - - - + <combo_box label="'Mature'" name="access_combo"> + <combo_item name="Adult"> + 'Adult' + </combo_item> + <combo_item name="Mature"> + 'Mature' + </combo_item> + <combo_item name="PG"> + 'PG' + </combo_item> + </combo_box> <button label="?" name="access_help"/> <button label="Aplicar" name="apply_btn"/> <button label="Teleportar a su Base a un usuario..." name="kick_btn"/> |