From c495e7f42a3e20f217949cb32e3e63043b978334 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 27 Apr 2010 14:03:42 -0400 Subject: EXT-7109 : Ensure "Open" works for all types, change to "Open Original" for links Added new "Open Original" menu item for links, to clarify that you're opening the item the link is pointing to. --- indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 5e1f6b58e8..11459ad0e6 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -409,6 +409,14 @@ function="Inventory.DoToSelected" parameter="open" /> + + + Date: Tue, 27 Apr 2010 22:35:54 +0300 Subject: Additional commit for EXT-6956 (Create perpetual loading indicator widget). - Made the indicator rotate clockwise (by flipping the images and reversing the order they're traversed). - The textures are now preloaded. Approved by Erica. --HG-- branch : product-engine --- .../skins/default/textures/icons/Progress_1.png | Bin 464 -> 470 bytes .../skins/default/textures/icons/Progress_10.png | Bin 461 -> 461 bytes .../skins/default/textures/icons/Progress_11.png | Bin 471 -> 475 bytes .../skins/default/textures/icons/Progress_12.png | Bin 457 -> 455 bytes .../skins/default/textures/icons/Progress_2.png | Bin 461 -> 453 bytes .../skins/default/textures/icons/Progress_3.png | Bin 487 -> 454 bytes .../skins/default/textures/icons/Progress_4.png | Bin 466 -> 454 bytes .../skins/default/textures/icons/Progress_5.png | Bin 477 -> 468 bytes .../skins/default/textures/icons/Progress_6.png | Bin 460 -> 462 bytes .../skins/default/textures/icons/Progress_7.png | Bin 483 -> 469 bytes .../skins/default/textures/icons/Progress_8.png | Bin 467 -> 454 bytes .../skins/default/textures/icons/Progress_9.png | Bin 483 -> 469 bytes indra/newview/skins/default/textures/textures.xml | 24 ++++++++++----------- 13 files changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/textures/icons/Progress_1.png b/indra/newview/skins/default/textures/icons/Progress_1.png index 58b56003c4..5d6efbfa2a 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_1.png and b/indra/newview/skins/default/textures/icons/Progress_1.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_10.png b/indra/newview/skins/default/textures/icons/Progress_10.png index 07fe0be8a3..28203324f1 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_10.png and b/indra/newview/skins/default/textures/icons/Progress_10.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_11.png b/indra/newview/skins/default/textures/icons/Progress_11.png index 215d68cc46..6b87be0c3f 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_11.png and b/indra/newview/skins/default/textures/icons/Progress_11.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_12.png b/indra/newview/skins/default/textures/icons/Progress_12.png index d755588621..089d58b090 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_12.png and b/indra/newview/skins/default/textures/icons/Progress_12.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_2.png b/indra/newview/skins/default/textures/icons/Progress_2.png index 6640ee227b..94cb73b1f7 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_2.png and b/indra/newview/skins/default/textures/icons/Progress_2.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_3.png b/indra/newview/skins/default/textures/icons/Progress_3.png index 5decbe977e..a04a5b5263 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_3.png and b/indra/newview/skins/default/textures/icons/Progress_3.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_4.png b/indra/newview/skins/default/textures/icons/Progress_4.png index 56e81c17aa..a467098d82 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_4.png and b/indra/newview/skins/default/textures/icons/Progress_4.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_5.png b/indra/newview/skins/default/textures/icons/Progress_5.png index a89bf2ac62..ea64f1d907 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_5.png and b/indra/newview/skins/default/textures/icons/Progress_5.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_6.png b/indra/newview/skins/default/textures/icons/Progress_6.png index 233c479540..fe4447935f 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_6.png and b/indra/newview/skins/default/textures/icons/Progress_6.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_7.png b/indra/newview/skins/default/textures/icons/Progress_7.png index 631d7a6819..64fa294771 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_7.png and b/indra/newview/skins/default/textures/icons/Progress_7.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_8.png b/indra/newview/skins/default/textures/icons/Progress_8.png index ac0e3f13f7..a1c9a7f2eb 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_8.png and b/indra/newview/skins/default/textures/icons/Progress_8.png differ diff --git a/indra/newview/skins/default/textures/icons/Progress_9.png b/indra/newview/skins/default/textures/icons/Progress_9.png index 17fb4a0335..f3e9723184 100644 Binary files a/indra/newview/skins/default/textures/icons/Progress_9.png and b/indra/newview/skins/default/textures/icons/Progress_9.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 1080ff347c..bbb82d86b1 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -580,17 +580,17 @@ with the same filename but different name - - - - - - - - - - - - + + + + + + + + + + + + -- cgit v1.2.3 From aa7b3312c201ccea29a0e07a38021bec764bfc64 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 27 Apr 2010 17:20:35 -0400 Subject: Small XML fix for Inventory Floater, which was obscuring the text showing the number of items fetched. --- indra/newview/skins/default/xui/en/panel_main_inventory.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 27d66945d9..46625144e1 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -3,7 +3,7 @@ background_visible="true" default_tab_group="1" follows="all" - height="408" + height="423" label="Things" layout="topleft" min_height="350" @@ -48,7 +48,7 @@ left="10" max_length="300" name="inventory search editor" - top="3" + top="18" width="303" /> Date: Wed, 28 Apr 2010 11:00:53 +0300 Subject: Fixed critical bug EXT-4837 ( [NUX] When filter results in null state, provide a message suggesting the user try global search.) Implemented passing of entered filter substring without head spaces to search URI in help message for null filtered results. * Updated setting "no item message" to use search term from filter editor for avatar & group lists and for inventory panels. * Updated appropriate translatable strings to get [SEARCH_TERM] substitution. * Updated processing of filter substring to pass original string to methods applied new filter. Additional necessary changes * Changed place to set "no item message" for group list from refresh to where filter is updated (like in avatar lists) * Removed converting of filter substring to upper case in Places & My Appearance sidepanels (this conversion has already been implemented in where filter is applied) * Added a separate message for Landmarks to set search URI to secondlife:///app/search/places for Lanmarks panel; other inventory related panels have URL to all searched categories (secondlife:///app/search/all) Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/326/ --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_people.xml | 8 ++++---- indra/newview/skins/default/xui/en/strings.xml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index fa4213667b..066ea3be6e 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -16,13 +16,13 @@ value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." /> + value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." /> + value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." /> @@ -36,7 +36,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M - Didn't find what you're looking for? Try [secondlife:///app/search/people Search]. + Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]. + value="Didn't find what you're looking for? Try [secondlife:///app/search/groups/[SEARCH_TERM] Search]." /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index bf30e89a59..b0e43e72ed 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1842,7 +1842,8 @@ Clears (deletes) the media and all params from the given face. Press ESC to return to World View - Didn't find what you're looking for? Try [secondlife:///app/search/all Search]. + Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]. + Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]. Drag a landmark here to add it to your favorites. You do not have a copy of this texture in your inventory -- cgit v1.2.3 From 9e8f820e35d9d9ea9318f51ac1f46b11f61a68f7 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 28 Apr 2010 11:26:03 +0300 Subject: Improved xml file according to Eric's suggestion: controls are not intended to be translated marked with translate="false" attribute. Trivial, not reviewed. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/outfit_accordion_tab.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml index b3150bb98b..5fcc9b012b 100644 --- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml @@ -1,6 +1,7 @@ + -- cgit v1.2.3 From e8540593e6bfd17f86b76dcfcac9442cea9a8cb6 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Wed, 28 Apr 2010 14:48:16 +0300 Subject: Fixed low bug EXT-6776 ([FRAGMENTATION] Call strings need change). - Removed string fragmentation by changing concatenation of name and action to whole-sentence strings. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/328 --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b0e43e72ed..3cba76cbfa 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2951,8 +2951,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Your call has been answered - Started a voice call - Joined the voice call + You started a voice call + You joined the voice call + [NAME] started a voice call Joining voice call... -- cgit v1.2.3 From 6d3c960525afda3bcdb7ef3e58b67ae1bd4a4dd3 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Wed, 28 Apr 2010 14:50:33 +0300 Subject: Implemented major task EXT-6979 (Connect wearable editor texture and color editors to the textures stored in the wearables themselves): - added PickerControlEntry - dictionary entry which contains information about particular picker control - added ColorSwatchCtrls and TextureCtrls - lists of PickerControlEntries, contain information about color and texture controls for particular EWearableType - implemented some helper functions for picker management Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/327/ --HG-- branch : product-engine --- .../skins/default/xui/en/panel_edit_alpha.xml | 25 +++++++++++++++++----- .../skins/default/xui/en/panel_edit_eyes.xml | 7 ++++-- .../skins/default/xui/en/panel_edit_gloves.xml | 14 ++++++++---- .../skins/default/xui/en/panel_edit_hair.xml | 7 ++++-- .../skins/default/xui/en/panel_edit_jacket.xml | 15 ++++++++++--- .../skins/default/xui/en/panel_edit_pants.xml | 10 +++++++-- .../skins/default/xui/en/panel_edit_shirt.xml | 10 +++++++-- .../skins/default/xui/en/panel_edit_shoes.xml | 10 +++++++-- .../skins/default/xui/en/panel_edit_skin.xml | 17 +++++++++++---- .../skins/default/xui/en/panel_edit_skirt.xml | 10 +++++++-- .../skins/default/xui/en/panel_edit_socks.xml | 10 +++++++-- .../skins/default/xui/en/panel_edit_underpants.xml | 10 +++++++-- .../skins/default/xui/en/panel_edit_undershirt.xml | 10 +++++++-- 13 files changed, 121 insertions(+), 34 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml index 1d0c0a02b0..cfcdc25f81 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml @@ -32,7 +32,10 @@ name="Lower Alpha" tool_tip="Click to choose a picture" top="10" - width="94" /> + width="94" > + + + width="94"> + + + width="94" > + + + width="94" > + + + width="94" > + + - + width="64" > + + + + width="64" > + + - - + + + + - + width="64" > + + + + width="74" > + + + width="74" > + + + width="74" > + + + width="64" > + + + width="64" > + + + width="64" > + + + width="64" > + + + width="64" > + + + width="64" > + + + width="74" > + + + width="74" > + + - + width="74" > + + + + width="64" > + + + width="64" > + + + width="64" > + + + width="64" > + + + width="64" > + + + width="64" > + + + width="64" > + + + width="64" > + + Date: Wed, 28 Apr 2010 17:47:08 +0300 Subject: partial implementation of EXT-6723 Create specialized view of inventory for "clothing" accordion tab of outfit editor - added grouping clothing items by wearable type (shirt, jeans etc.) - added sorting clothing items by wearing order in groups - added separators between items of the same wearable type (lists: clothing, body parts) - added list specific button bars - partially added dummy items for missing wearable types in the COF (clothing list) Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/322 --HG-- branch : product-engine --- .../xui/en/panel_bodyparts_list_button_bar.xml | 36 +++++++++++++++++++++ .../xui/en/panel_clothing_list_button_bar.xml | 37 ++++++++++++++++++++++ .../skins/default/xui/en/panel_cof_wearables.xml | 1 + 3 files changed, 74 insertions(+) create mode 100644 indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml create mode 100644 indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml new file mode 100644 index 0000000000..9d19b89a61 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml @@ -0,0 +1,36 @@ + + + +