From a16195fb81d7f4c7a5dd60f91d067bbdcac0f44d Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Mon, 19 Apr 2010 15:50:45 +0300 Subject: Fixed normal bug EXT-6864 (Resident-related menu items are enabled/displayed for PSTN bridge callers) * Disabled all currently processed menu items related to interaction with a resident for Avaline callers. * Added enable callback for View Profile menu item to disable it for Avaline callers. * Disabled menu items related to text chat. Full list is: - View Profile - Add Friend - IM - Call - Share - Pay - Block Text - Moderate Options: -- Allow Text chat DEV notes: To process moderation options separate "on_enable handler" was created for group moderate actions. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/261/ --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/menu_participant_list.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index 59c7f4ed85..2515b60868 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml @@ -30,6 +30,9 @@ name="View Profile"> + -- cgit v1.2.3 From a94ec45cb18f262e9cb9277960c450d84479757b Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Mon, 19 Apr 2010 16:06:23 +0300 Subject: Fixed normal bug EXT-6896 (String changes to default help text in Friends, Nearby and Recent lists) * Updated default help text in Friends, Nearby and Recent lists according to requirements in the ticket. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/259/ --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_people.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 8131b75b70..43175c8509 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -13,10 +13,10 @@ width="333"> + 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="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." /> @@ -264,8 +264,8 @@ top="10" width="293" wrap="true"> - To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend. -If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map]. + Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend. +Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map]. Date: Mon, 19 Apr 2010 16:20:11 +0300 Subject: Fixed windows EOLs. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_people.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 43175c8509..7330eded4c 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -264,7 +264,7 @@ top="10" width="293" wrap="true"> - Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend. + Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend. Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map]. -- cgit v1.2.3 From d57e8ecc7e119ca6930499ee270f438fc5ec415a Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Mon, 19 Apr 2010 17:21:16 +0300 Subject: fixed EXT-6848 Avoid creation of dummy objects in LLOnlineStatusToast and LLPanelGenericTip classes. * decoupled tip toast panel related logic from class LLTast; * moved documentation comment of LLPanelGenericTip constructor from .cpp to .h file; * corrected name attribute in panel_generic_tip.xml; reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/230/ --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_generic_tip.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml index 453ed7c7a6..eea92895f5 100644 --- a/indra/newview/skins/default/xui/en/panel_generic_tip.xml +++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml @@ -3,7 +3,7 @@ height="40" layout="topleft" left="0" - name="panel_system_tip" + name="panel_generic_tip" top="0" width="305"> Date: Mon, 19 Apr 2010 17:26:14 +0300 Subject: Fixed normal bug EXT-6899 (String changes to default and null results Groups List help text) * Updated help texts in Groups List according to requirements in the ticket. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/260/ --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_people.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 7330eded4c..8a4a28e188 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -35,10 +35,10 @@ --> + value="Didn't find what you're looking for? Try [secondlife:///app/search/groups Search]." /> + value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." /> Date: Mon, 19 Apr 2010 17:56:09 +0300 Subject: Fixed bug EXT-6842 ([I18N] Date format in Profile - mm/dd/yyyy needs to be: yyyy/mm/dd for Japanese). - Made avatar registration date localizeable. - Specified localization templates for English, Japanese and German. Reviewed by Mike: https://jira.secondlife.com/browse/EXT-6842 --HG-- branch : product-engine --- indra/newview/skins/default/xui/de/strings.xml | 3 +++ indra/newview/skins/default/xui/en/strings.xml | 4 ++++ indra/newview/skins/default/xui/ja/strings.xml | 3 +++ 3 files changed, 10 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index fd05f02ceb..b3aeb8cd68 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -3577,4 +3577,7 @@ Missbrauchsbericht Inhalt + + [day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt] + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 813f59ff89..df4e4153f4 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3103,4 +3103,8 @@ Abuse Report New Script New Folder Contents + + + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index b9df82adcd..a54d96061f 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -3577,4 +3577,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ コンテンツ + + [year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt] + -- cgit v1.2.3 From 300651e2c80b1d4fc3498758f65a1d0e8eb59934 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Mon, 19 Apr 2010 19:19:29 +0300 Subject: Fixed bug EXT-6852 ([STRING IN EN] Media settings : Owner, Group, and Anyone). Added names to nameless textboxes. Trivial change, not reviewed. --HG-- branch : product-engine --- .../skins/default/xui/en/panel_media_settings_permissions.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml index b5c2371510..c5f44cd049 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml @@ -42,10 +42,11 @@ + name="owner_label"> Owner @@ -79,10 +80,11 @@ + name="group_label"> Group: @@ -126,10 +128,11 @@ + name="anyone_label"> Anyone -- cgit v1.2.3 From c3fa45282f5bdb0cb7a3fcd680154e88cafde4bb Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Mon, 19 Apr 2010 17:19:35 -0700 Subject: Fix for EXT-6925 (Mime type association missing for video/* wildcard). In mime_types*.xml, added sections to the mimetype entries for video/* and audio/* which point to the quicktime plugin on Mac/Windows and gstreamer on Linux. Reviewed by Callum at http://codereview.lindenlab.com/1252035 --- indra/newview/skins/default/xui/en/mime_types.xml | 6 ++++++ indra/newview/skins/default/xui/en/mime_types_linux.xml | 6 ++++++ indra/newview/skins/default/xui/en/mime_types_mac.xml | 6 ++++++ 3 files changed, 18 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index 76c0d027f3..8e1e5ff062 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -138,6 +138,9 @@ audio + + media_plugin_quicktime +