From 88f2d107c0a757b9cc6dee7c30a9482c02a05c08 Mon Sep 17 00:00:00 2001 From: "Yuri Chebotarev ychebotarev@productengine.com" Date: Mon, 26 Oct 2009 11:14:13 +0200 Subject: no ticket set single_instance for nearby_chat floater --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/floater_nearby_chat.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 25d337ccec..d24d1b7064 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -14,6 +14,7 @@ save_rect="true" title="Nearby Chat" save_visibility="true" + single_instance="true" width="320"> Date: Mon, 26 Oct 2009 17:14:32 +0200 Subject: Fixed normal bugs EXT-1628 ([BSI] - New IM system isn't sending typing notifications anymore) and EXT-1629 ([BSI] - add hint in IM window when Resident is typing) --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4c19b22ac5..7efda2b882 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -264,10 +264,6 @@ Track your camera Control your camera - - -- Instant message logging enabled -- - (Unnamed) - PG Mature @@ -2884,7 +2880,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Failed to start viewer - + + -- Instant message logging enabled -- + [NAME] is typing... + (Unnamed) + Joining Voice Chat... -- cgit v1.2.3 From ff37134a405e81899b4d9e7d07be7e3da85c8278 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Mon, 26 Oct 2009 19:30:46 +0200 Subject: Implemented low task EXT-1156(Implement option to show/hide avatar icon in the friend list) --HG-- branch : product-engine --- .../skins/default/xui/en/menu_people_friends_view_sort.xml | 11 ++++++++--- .../skins/default/xui/en/menu_people_nearby_view_sort.xml | 11 ++++++++--- .../skins/default/xui/en/menu_people_recent_view_sort.xml | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index cc17e9dd4b..eedb4383bb 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -23,9 +23,14 @@ parameter="sort_status" /> - - - + + + + diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml index f91a961388..c002cd078f 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -12,9 +12,14 @@ - - - + + + + diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index d09871cff3..cfd6dc78b6 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -23,9 +23,14 @@ parameter="sort_name" /> - - - + + + + -- cgit v1.2.3 From 3b40f9052bdd22ca26610becaa8c37fba07cc1f2 Mon Sep 17 00:00:00 2001 From: Denis Serdjuk Date: Tue, 27 Oct 2009 13:49:06 +0200 Subject: fixed Bug EXT-1602 'Add new folder' and 'Add new landmark' has same icons that is deceitful New menubutton has been implemented according to Viewer 2.0 Design Specification:Places Task Panel. It generates a menu for AddLandmark and AddFolder options --HG-- branch : product-engine --- .../skins/default/xui/en/menu_place_add_button.xml | 27 ++++++++++++++++++++++ .../skins/default/xui/en/panel_landmarks.xml | 14 +---------- 2 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/menu_place_add_button.xml (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml new file mode 100644 index 0000000000..e3a39a1242 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_place_add_button.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index c33f68eaf7..5293043ba7 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -114,22 +114,10 @@ image_disabled="AddItem_Disabled" layout="topleft" left_pad="5" - name="add_landmark_btn" + name="add_btn" picture_style="true" tool_tip="Add new landmark" width="18" /> -