diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
8 files changed, 123 insertions, 99 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 5e7bd605d2..ce96c488b4 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4763,6 +4763,18 @@ Are you sure you want to delete your travel, web, and search history? notext="Cancel" yestext="OK"/> </notification> + + <notification + icon="alertmodal.tga" + name="ConfirmClearCache" + type="alertmodal"> +Are you sure you want to clear your viewer cache? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> <notification icon="alertmodal.tga" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 37aab059a9..2cc9d9c1b0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -20,8 +20,112 @@ height="12" layout="topleft" left="33" + name="Cache:" + top_pad="10" + width="100"> + Cache: + </text> + <spinner + control_name="CacheSize" + decimal_digits="0" + follows="left|top" + height="23" + increment="64" + initial_value="1024" + label="Cache size (64 - 9984MB)" + label_width="150" + layout="topleft" + left="80" + max_val="9984" + min_val="64" + top_pad="10" + name="cachesizespinner" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_box5" + width="20"> + MB + </text> + <button + follows="left|top" + height="23" + label="Clear Cache" + label_selected="Clear Cache" + layout="topleft" + left_pad="30" + name="clear_cache" + top_delta="0" + width="100"> + <button.commit_callback + function="Pref.ClearCache" /> + </button> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="80" + name="Cache location" + top_pad="5" + width="300"> + Cache location: + </text> + <line_editor + control_name="CacheLocationTopFolder" + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + height="23" + layout="topleft" + left="80" + max_length="4096" + name="cache_location" + top_pad="5" + width="205" /> + <button + follows="left|top" + height="23" + label="Browse" + label_selected="Browse" + layout="topleft" + left_pad="5" + name="set_cache" + top_delta="0" + width="100"> + <button.commit_callback + function="Pref.SetCache" /> + </button> + <button + follows="left|top" + height="23" + label="Default Location" + label_selected="Default Location" + layout="topleft" + left_pad="3" + name="default_cache_location" + top_delta="0" + width="100"> + <button.commit_callback + function="Pref.ResetCache" /> + </button> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="33" name="UI Size:" - top_pad="25" + top_pad="20" width="100"> UI size: </text> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 901a1257e0..1c22a5c02e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -93,98 +93,6 @@ name="connection_port" top_delta="3" width="170" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="80" - mouse_opaque="false" - name="cache_size_label_l" - top_pad="20" - width="200"> - Cache size - </text> - <slider - can_edit_text="true" - control_name="CacheSize" - decimal_digits="0" - follows="left|top" - height="15" - increment="16" - initial_value="512" - layout="topleft" - left_delta="150" - max_val="1024" - min_val="32" - name="cache_size" - top_delta="-2" - width="180" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_pad="6" - mouse_opaque="false" - name="text_box5" - top_delta="1" - width="40"> - MB - </text> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="80" - name="Cache location" - top_delta="20" - width="300"> - Cache location: - </text> - <line_editor - control_name="CacheLocationTopFolder" - border_style="line" - border_thickness="1" - follows="left|top" - font="SansSerif" - height="23" - layout="topleft" - left="80" - max_length="4096" - name="cache_location" - top_pad="5" - width="205" /> - <button - follows="left|top" - height="23" - label="Browse" - label_selected="Browse" - layout="topleft" - left_pad="5" - name="set_cache" - top_delta="-1" - width="100"> - <button.commit_callback - function="Pref.SetCache" /> - </button> - <button - follows="left|top" - height="23" - label="Reset" - label_selected="Reset" - layout="topleft" - left_pad="3" - name="reset_cache" - top_delta="0" - width="100"> - <button.commit_callback - function="Pref.ResetCache" /> - </button> <text type="string" diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml index ccf3d4bf91..87177e285c 100644 --- a/indra/newview/skins/default/xui/es/floater_camera.xml +++ b/indra/newview/skins/default/xui/es/floater_camera.xml @@ -13,7 +13,7 @@ Modos de cámara </floater.string> <floater.string name="pan_mode_title"> - Orbital - Zoom - Panóramica + Orbital - Zoom - Panorámica </floater.string> <floater.string name="presets_mode_title"> Vistas predefinidas @@ -59,7 +59,7 @@ </panel> <panel name="buttons"> <button label="" name="presets_btn" tool_tip="Vistas predefinidas"/> - <button label="" name="pan_btn" tool_tip="Orbital - Zoom - Panóramica"/> + <button label="" name="pan_btn" tool_tip="Orbital - Zoom - Panorámica"/> <button label="" name="avatarview_btn" tool_tip="Modos de cámara"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index f215e5909c..13be47f700 100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml @@ -480,7 +480,7 @@ Modificar la parcela </text> <button label="Dividir" label_selected="Dividir" name="button subdivide land"/> - <button label="Inscribirse" label_selected="Unir" name="button join land"/> + <button label="Unir" label_selected="Unir" name="button join land"/> <text name="label_parcel_trans"> Transacciones de terreno </text> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 138bbd9412..1c45d36813 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -146,7 +146,7 @@ <menu_item_check label="Estadísticas" name="Statistics Bar"/> <menu_item_check label="Mostrar cuánto cuesta renderizar el avatar" name="Avatar Rendering Cost"/> </menu> - <menu label="Realzando y Visibilidad" name="Highlighting and Visibility"> + <menu label="Realzado y Visibilidad" name="Highlighting and Visibility"> <menu_item_check label="Baliza con destellos" name="Cheesy Beacon"/> <menu_item_check label="Ocultar las partículas" name="Hide Particles"/> <menu_item_check label="Ocultar lo seleccionado" name="Hide Selected"/> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml index 0ac3d11ab0..ac40587033 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml @@ -48,7 +48,7 @@ m </text> <slider label="Núm. máx. de partículas:" name="MaxParticleCount"/> - <slider label="N.º máximo de avatares no impostores:" name="MaxNumberAvatarDrawn"/> + <slider label="Nº máx. de avats. no impostores:" name="MaxNumberAvatarDrawn"/> <slider label="Calidad de procesamiento:" name="RenderPostProcess"/> <text name="MeshDetailText"> Detalle de la malla: diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml index 8ce8e23138..fa7806a75a 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml @@ -14,7 +14,7 @@ <slider label="Música en streaming" name="Music Volume"/> <check_box label="Activados" name="enable_music"/> <slider label="Multimedia" name="Media Volume"/> - <check_box label="Activada" name="enable_media"/> + <check_box label="Activados" name="enable_media"/> <slider label="Chat de voz" name="Voice Volume"/> <check_box label="Activado" name="enable_voice_check"/> <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="true"/> |