From 25c4f8ff46867ac1e600bf12521740fa8e14722e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 22 Oct 2010 17:06:18 -0700 Subject: STORM-454 : fix height in world map, allow altitude till 4096m, display altitude on 4 digits --- indra/newview/skins/default/xui/en/floater_world_map.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 20629018e2..34c091b0da 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -541,7 +541,7 @@ halign="right" height="16" layout="topleft" - left="25" + left="15" name="events_label" top_pad="16" width="70"> @@ -574,7 +574,8 @@ left_delta="47" max_val="255" min_val="0" - name="teleport_coordinate_y" > + name="teleport_coordinate_y" + width="44" > @@ -584,12 +585,13 @@ follows="right|bottom" height="23" increment="1" - initial_value="128" + initial_value="23" layout="topleft" left_delta="47" - max_val="255" + max_val="4096" min_val="0" - name="teleport_coordinate_z"> + name="teleport_coordinate_z" + width="56" > -- cgit v1.2.3 From 01e5519323415b331fa3202f95d63e3158b199ad Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 26 Oct 2010 11:28:39 -0700 Subject: STORM-454 : Tweak the teleport_coordinate_z width to better align in world map UI --- indra/newview/skins/default/xui/en/floater_world_map.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 34c091b0da..019e7cd032 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -591,7 +591,7 @@ max_val="4096" min_val="0" name="teleport_coordinate_z" - width="56" > + width="55" > -- cgit v1.2.3 From 8947724baa6d595844daeee2f18c865d1886acc5 Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Tue, 26 Oct 2010 23:13:36 -0400 Subject: STORM-482; change to allow 1023 characters again in local chat. While fixing this, I noticed that a change to XUI meant that many floaters had tried to set a limit on text length for line_editor components but it didn't take effect because the parameter name was wrong; I changed them to agree. --- indra/newview/skins/default/xui/en/alert_line_editor.xml | 2 +- .../newview/skins/default/xui/en/floater_about_land.xml | 10 +++++----- .../skins/default/xui/en/floater_buy_currency.xml | 2 +- indra/newview/skins/default/xui/en/floater_god_tools.xml | 16 ++++++++-------- .../default/xui/en/floater_inventory_item_properties.xml | 6 +++--- .../skins/default/xui/en/floater_outfit_save_as.xml | 2 +- indra/newview/skins/default/xui/en/floater_pay.xml | 2 +- .../newview/skins/default/xui/en/floater_pay_object.xml | 2 +- .../skins/default/xui/en/floater_post_process.xml | 2 +- indra/newview/skins/default/xui/en/floater_postcard.xml | 4 ++-- .../skins/default/xui/en/floater_preview_animation.xml | 2 +- .../skins/default/xui/en/floater_preview_gesture.xml | 8 ++++---- .../skins/default/xui/en/floater_preview_notecard.xml | 2 +- .../skins/default/xui/en/floater_preview_sound.xml | 2 +- .../skins/default/xui/en/floater_preview_texture.xml | 2 +- .../skins/default/xui/en/floater_report_abuse.xml | 4 ++-- .../skins/default/xui/en/floater_script_preview.xml | 2 +- .../skins/default/xui/en/floater_sound_preview.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_tools.xml | 6 +++--- .../newview/skins/default/xui/en/floater_ui_preview.xml | 6 +++--- .../skins/default/xui/en/panel_edit_classified.xml | 2 +- indra/newview/skins/default/xui/en/panel_edit_pick.xml | 2 +- .../newview/skins/default/xui/en/panel_edit_wearable.xml | 2 +- .../skins/default/xui/en/panel_group_info_sidetray.xml | 2 +- .../skins/default/xui/en/panel_group_land_money.xml | 2 +- .../newview/skins/default/xui/en/panel_group_notices.xml | 8 ++++---- indra/newview/skins/default/xui/en/panel_group_roles.xml | 4 ++-- .../newview/skins/default/xui/en/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/en/panel_login.xml | 4 ++-- .../skins/default/xui/en/panel_nearby_chat_bar.xml | 2 +- .../skins/default/xui/en/panel_preferences_advanced.xml | 2 +- .../skins/default/xui/en/panel_prim_media_controls.xml | 2 +- .../newview/skins/default/xui/en/sidepanel_item_info.xml | 4 ++-- .../newview/skins/default/xui/en/sidepanel_task_info.xml | 4 ++-- 34 files changed, 64 insertions(+), 64 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml index 82bf5fc8da..54dbc698c8 100644 --- a/indra/newview/skins/default/xui/en/alert_line_editor.xml +++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml @@ -4,7 +4,7 @@ revert_on_esc="true" commit_on_focus_lost="true" ignore_tab="true" - max_length="254" + max_length_bytes="254" text_pad_right="0" text_pad_left="2" mouse_opaque="true"/> diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 89ed16e7c2..0a27cc7bc9 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -128,7 +128,7 @@ height="23" layout="topleft" left_pad="2" - max_length="63" + max_length_bytes="63" name="Name" top_delta="0" width="365" /> @@ -1081,7 +1081,7 @@ Leyla Linden follows="left|top" height="23" layout="topleft" - max_length="6" + max_length_bytes="6" name="clean other time" left_pad="0" width="46" @@ -1625,7 +1625,7 @@ Only large parcels can be listed in search. height="23" layout="topleft" left_pad="0" - max_length="255" + max_length_bytes="255" name="media_url" select_on_focus="true" width="300" @@ -1666,7 +1666,7 @@ Only large parcels can be listed in search. height="20" layout="topleft" left="110" - max_length="255" + max_length_bytes="255" name="url_description" select_on_focus="true" tool_tip="Text displayed next to play/load button" @@ -1821,7 +1821,7 @@ Only large parcels can be listed in search. height="23" layout="topleft" left="100" - max_length="255" + max_length_bytes="255" name="music_url" top_delta="0" right="-15" diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 637f9f55d4..cd5922a9a2 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -114,7 +114,7 @@ @@ -236,7 +236,7 @@ height="16" layout="topleft" left_delta="108" - max_length="10" + max_length_bytes="10" name="estate" top_delta="0" width="50" /> @@ -260,7 +260,7 @@ height="16" layout="topleft" left_delta="108" - max_length="10" + max_length_bytes="10" name="parentestate" tool_tip="This is the parent estate for this region" top_delta="0" @@ -287,7 +287,7 @@ height="16" layout="topleft" left_delta="88" - max_length="10" + max_length_bytes="10" name="gridposx" tool_tip="This is the grid x position for this region" top_delta="0" @@ -302,7 +302,7 @@ height="16" layout="topleft" left_pad="10" - max_length="10" + max_length_bytes="10" name="gridposy" tool_tip="This is the grid y position for this region" top_delta="0" @@ -329,7 +329,7 @@ height="16" layout="topleft" left_pad="0" - max_length="10" + max_length_bytes="10" name="redirectx" width="50"> @@ -754,7 +754,7 @@ height="22" layout="topleft" left_pad="10" - max_length="63" + max_length_bytes="63" name="parameter" top_delta="0" width="290" /> diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml index 2ef52bf539..29f09dd0b2 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml @@ -58,7 +58,7 @@ height="16" layout="topleft" left_delta="78" - max_length="63" + max_length_bytes="63" name="LabelItemName" top_delta="0" width="252" /> @@ -81,7 +81,7 @@ height="16" layout="topleft" left_delta="78" - max_length="127" + max_length_bytes="127" name="LabelItemDesc" top_delta="0" width="252" /> @@ -348,7 +348,7 @@ height="16" layout="topleft" left_pad="5" - max_length="25" + max_length_bytes="25" name="EditPrice" top_delta="0" width="242" /--> diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml index 1d73d516d0..068737494f 100644 --- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml @@ -50,7 +50,7 @@ as a new Outfit: left_delta="0" show_text_as_tentative="false" top_pad="0" - max_length="63" + max_length_bytes="63" name="name ed" width="200"> [DESC] (new) diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml index 7ab565313e..41a7134b1d 100644 --- a/indra/newview/skins/default/xui/en/floater_pay.xml +++ b/indra/newview/skins/default/xui/en/floater_pay.xml @@ -84,7 +84,7 @@ top_pad="0" layout="topleft" left="130" - max_length="9" + max_length_bytes="9" name="amount" width="80" />