From 2c93c14c9d6cf6940169d33b806dede90e60033f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 16 Jul 2020 17:51:06 +0300
Subject: SL-13609 Better indicate which conversation is active in
 Conversations floater

---
 .../default/textures/icons/nearby_chat_icon.png    | Bin 399 -> 1035 bytes
 .../skins/default/xui/en/floater_im_session.xml    |  32 ++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png
index 5ac4258b9d..2cb577776d 100644
Binary files a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png and b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index c64ee5565a..15f02ab9c3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -267,6 +267,36 @@
                  right="-1">
                     <layout_panel
                      name="input_editor_layout_panel">
+                        <avatar_icon
+                         follows="left|bottom"
+                         name="avatar_icon"
+                         height="20"
+                         default_icon_name="Generic_Person"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         visible="false"
+                         width="20" />
+                        <group_icon
+                         follows="left|bottom"
+                         name="group_chat_icon"
+                         height="20"
+                         default_icon_name="Generic_Group"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         visible="false"
+                         width="20" />
+                        <icon
+                         follows="left|bottom"
+                         height="20"
+                         image_name="Nearby_chat_icon"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         name="nearby_chat_icon"
+                         visible="false"
+                         width="20"/>
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -280,7 +310,7 @@
                          spellcheck="true"
                          tab_group="3"
                          bottom="-8"
-                         left="5"
+                         left_pad="5"
                          right="-5"
                          wrap="true" />
                     </layout_panel>
-- 
cgit v1.2.3


From 03a33bf07541f4555c840e2323e9e68fadc72689 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 29 Jul 2020 12:37:07 +0300
Subject: SL-13695 update chat message string with instructions

---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++--
 1 file changed, 2 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 1bfac6aeb7..29eb733d41 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3691,10 +3691,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   Also there are some other places where "generic" is used.
   So, let add string with name="generic" with the same value as "generic_request_error" -->
   <string name="generic">
-    Error making request, please try again later.
+    Please close and reopen the conversation, or relog and try again.
   </string>
   <string name="generic_request_error">
-    Error making request, please try again later.
+    Please close and reopen the conversation, or relog and try again.
   </string>
   <string name="insufficient_perms_error">
     You do not have sufficient permissions.
-- 
cgit v1.2.3


From 6077f296dd7c23b188dd4813636f7b2b83658b96 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 5 Aug 2020 13:16:38 +0300
Subject: SL-13714 FIXED Buy floater allows multiple buy

---
 indra/newview/skins/default/xui/en/floater_buy_object.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 49be4290c7..1f7d52dbf5 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -32,6 +32,10 @@
      name="no_transfer_text">
         (no transfer)
     </floater.string>
+    <floater.string
+      name="mupliple_selected">
+        Mupliple selection
+    </floater.string>
     <scroll_list
      background_visible="true"
      draw_border="false"
-- 
cgit v1.2.3


From 61e318564e5c492ff7da70ef05f9596c4af8d369 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 17 Aug 2020 16:46:19 +0300
Subject: SL-13784 Highlight friends' names in Conversations floater

---
 indra/newview/skins/default/colors.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index e0da7f5d9e..601d5621a9 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -333,6 +333,9 @@
     <color
      name="ContextSilhouetteColor"
      reference="EmphasisColor" />
+    <color
+     name="ConversationFriendColor"
+     value="0.42 0.85 0.71 1" />
     <color
      name="DefaultHighlightDark"
      reference="White_10" />
-- 
cgit v1.2.3


From 02166bcf2a7bccb6fecacbbb88d48b265506be41 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 2 Sep 2020 15:23:17 +0300
Subject: SL-13890 Show appropriate message for empty 'Marketplace Listings'
 tabs

---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(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 29eb733d41..3964c749be 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2297,6 +2297,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="InventoryNoMatchingRecentItems">Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters].</string>
 	<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
 	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
+	<string name="MarketplaceNoListing">You have no listings yet.</string>
 	<string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
 	<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
-- 
cgit v1.2.3


From e9d50aeb3d1fa6b6251296f792d75cbc480f68fb Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 4 Sep 2020 20:12:48 +0300
Subject: SL-12243 Add a 'question mark' button into 'publishing classified'
 floater

---
 indra/newview/skins/default/xui/en/floater_publish_classified.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
index 322e34272c..84e0b489d0 100644
--- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -6,6 +6,7 @@
  layout="topleft"
  name="publish_classified"
  title="Publishing Classified"
+ help_topic="profile_edit_classified"
  width="320">
     <text
      top="20"
-- 
cgit v1.2.3


From 3310fa573fb520a55a48ee461c6b539abf447f67 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 6 Nov 2020 19:13:09 +0200
Subject: Reapplied SL-11215: Add release notes URLs to update-related
 notifications.

In scope of SL-13740 work, this reverts commit 1935d25c78bf46f0fdc8758b6f215f53d17fd94a.
---
 indra/newview/skins/default/xui/en/notifications.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a0d56a0d08..b6fabd2bc4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4039,6 +4039,8 @@ Finished download of raw terrain file to:
 [DOWNLOAD_PATH].
   </notification>
 
+  <!-- RequiredUpdate does not display release notes URL because we don't get
+       that from login.cgi's login failure message. -->
   <notification
    icon="alertmodal.tga"
    name="RequiredUpdate"
@@ -4056,6 +4058,7 @@ Please download from https://secondlife.com/support/downloads/
    name="PauseForUpdate"
    type="alertmodal">
 Version [VERSION] is required for login.
+Release notes: [URL]
 Click OK to download and install.
     <tag>confirm</tag>
     <usetemplate
@@ -4068,6 +4071,7 @@ Click OK to download and install.
    name="OptionalUpdateReady"
    type="alertmodal">
 Version [VERSION] has been downloaded and is ready to install.
+Release notes: [URL]
 Click OK to install.
     <tag>confirm</tag>
     <usetemplate
@@ -4080,6 +4084,7 @@ Click OK to install.
    name="PromptOptionalUpdate"
    type="alertmodal">
 Version [VERSION] has been downloaded and is ready to install.
+Release notes: [URL]
 Proceed?
     <tag>confirm</tag>
     <usetemplate
-- 
cgit v1.2.3


From af7554a83548a32de69fcbc7c7d4a49c19865183 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 10 Feb 2021 22:30:02 +0200
Subject: SL-11215 Release notes url should be an url

---
 indra/newview/skins/default/xui/en/notifications.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 990bf0e93f..107330d618 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4059,6 +4059,7 @@ Please download from https://secondlife.com/support/downloads/
    type="alertmodal">
 Version [VERSION] is required for login.
 Release notes: [URL]
+
 Click OK to download and install.
     <tag>confirm</tag>
     <usetemplate
@@ -4072,6 +4073,7 @@ Click OK to download and install.
    type="alertmodal">
 Version [VERSION] has been downloaded and is ready to install.
 Release notes: [URL]
+
 Click OK to install.
     <tag>confirm</tag>
     <usetemplate
@@ -4085,6 +4087,7 @@ Click OK to install.
    type="alertmodal">
 Version [VERSION] has been downloaded and is ready to install.
 Release notes: [URL]
+
 Proceed?
     <tag>confirm</tag>
     <usetemplate
-- 
cgit v1.2.3


From ba608514e1f2e7c05706fc3740d64b8390fbdb69 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 1 Mar 2021 17:16:07 +0200
Subject: SL-13609 Don't use any icon for Nearby chat

---
 .../skins/default/xui/en/floater_im_session.xml    | 57 ++++++++++------------
 .../xui/en/panel_conversation_list_item.xml        | 56 ++++++++++-----------
 2 files changed, 52 insertions(+), 61 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 15f02ab9c3..f61e5f1acc 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -265,38 +265,33 @@
                  bottom="-1"
                  left="0"
                  right="-1">
+                    <layout_panel
+                     auto_resize="false"
+                     name="session_icon_layout_panel"
+                     width="24">
+                      <avatar_icon
+                       follows="left|bottom"
+                       name="avatar_icon"
+                       height="20"
+                       default_icon_name="Generic_Person"
+                       layout="topleft"
+                       left="3"
+                       bottom="-9"
+                       visible="false"
+                       width="20" />
+                      <group_icon
+                       follows="left|bottom"
+                       name="group_chat_icon"
+                       height="20"
+                       default_icon_name="Generic_Group"
+                       layout="topleft"
+                       left="3"
+                       bottom="-9"
+                       visible="false"
+                       width="20" />
+                    </layout_panel>
                     <layout_panel
                      name="input_editor_layout_panel">
-                        <avatar_icon
-                         follows="left|bottom"
-                         name="avatar_icon"
-                         height="20"
-                         default_icon_name="Generic_Person"
-                         layout="topleft"
-                         left="3"
-                         bottom="-9"
-                         visible="false"
-                         width="20" />
-                        <group_icon
-                         follows="left|bottom"
-                         name="group_chat_icon"
-                         height="20"
-                         default_icon_name="Generic_Group"
-                         layout="topleft"
-                         left="3"
-                         bottom="-9"
-                         visible="false"
-                         width="20" />
-                        <icon
-                         follows="left|bottom"
-                         height="20"
-                         image_name="Nearby_chat_icon"
-                         layout="topleft"
-                         left="3"
-                         bottom="-9"
-                         name="nearby_chat_icon"
-                         visible="false"
-                         width="20"/>
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -310,7 +305,7 @@
                          spellcheck="true"
                          tab_group="3"
                          bottom="-8"
-                         left_pad="5"
+                         left="5"
                          right="-5"
                          wrap="true" />
                     </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 4372cf69bf..3be2beb0aa 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -6,45 +6,41 @@
  name="conversation_list_item"
  mouse_opaque="false"
  width="120">
-    <avatar_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left="9"
-     top="2"
-     visible="false"
-     width="20" />
-    <group_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Group"
-     layout="topleft"
-     left="9"
-     top="2"
-     visible="false"
-     width="20" />
-    <icon
-     follows="top|left"
-     height="20"
-     image_name="Nearby_chat_icon"
-     layout="topleft"
-     left="10"
-     name="nearby_chat_icon"
-     top="3"
-     visible="false"
-     width="20"/>
+
     <layout_stack
      animate="false"
      follows="all"
      height="24"
      layout="topleft"
-     left="30"
+     left="9"
      mouse_opaque="false"
      name="conversation_item_stack"
      orientation="horizontal"
      top="0"
-     width="90">
+     width="109">
+      <layout_panel
+        auto_resize="false"
+        name="session_icon_panel"
+        width="24">
+        <avatar_icon
+         follows="top|left"
+         height="20"
+         default_icon_name="Generic_Person"
+         layout="topleft"
+         left="0"
+         top="2"
+         visible="false"
+         width="20" />
+        <group_icon
+         follows="top|left"
+         height="20"
+         default_icon_name="Generic_Group"
+         layout="topleft"
+         left="0"
+         top="2"
+         visible="false"
+         width="20" />
+        </layout_panel>
         <layout_panel
          auto_resize="false"
          user_resize="false"        
-- 
cgit v1.2.3


From e51ec77431380891b98c40e89edf8f57d90710c4 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 1 Apr 2021 13:47:18 +0300
Subject: SL-15053 Use previous icon for Nearby chat

---
 .../default/textures/icons/nearby_chat_icon.png    | Bin 1035 -> 399 bytes
 .../skins/default/xui/en/floater_im_session.xml    |  57 +++++++++++----------
 .../xui/en/panel_conversation_list_item.xml        |  56 ++++++++++----------
 3 files changed, 61 insertions(+), 52 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png
index 2cb577776d..5ac4258b9d 100644
Binary files a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png and b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index f61e5f1acc..15f02ab9c3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -265,33 +265,38 @@
                  bottom="-1"
                  left="0"
                  right="-1">
-                    <layout_panel
-                     auto_resize="false"
-                     name="session_icon_layout_panel"
-                     width="24">
-                      <avatar_icon
-                       follows="left|bottom"
-                       name="avatar_icon"
-                       height="20"
-                       default_icon_name="Generic_Person"
-                       layout="topleft"
-                       left="3"
-                       bottom="-9"
-                       visible="false"
-                       width="20" />
-                      <group_icon
-                       follows="left|bottom"
-                       name="group_chat_icon"
-                       height="20"
-                       default_icon_name="Generic_Group"
-                       layout="topleft"
-                       left="3"
-                       bottom="-9"
-                       visible="false"
-                       width="20" />
-                    </layout_panel>
                     <layout_panel
                      name="input_editor_layout_panel">
+                        <avatar_icon
+                         follows="left|bottom"
+                         name="avatar_icon"
+                         height="20"
+                         default_icon_name="Generic_Person"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         visible="false"
+                         width="20" />
+                        <group_icon
+                         follows="left|bottom"
+                         name="group_chat_icon"
+                         height="20"
+                         default_icon_name="Generic_Group"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         visible="false"
+                         width="20" />
+                        <icon
+                         follows="left|bottom"
+                         height="20"
+                         image_name="Nearby_chat_icon"
+                         layout="topleft"
+                         left="3"
+                         bottom="-9"
+                         name="nearby_chat_icon"
+                         visible="false"
+                         width="20"/>
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -305,7 +310,7 @@
                          spellcheck="true"
                          tab_group="3"
                          bottom="-8"
-                         left="5"
+                         left_pad="5"
                          right="-5"
                          wrap="true" />
                     </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 3be2beb0aa..4372cf69bf 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -6,41 +6,45 @@
  name="conversation_list_item"
  mouse_opaque="false"
  width="120">
-
+    <avatar_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Person"
+     layout="topleft"
+     left="9"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Group"
+     layout="topleft"
+     left="9"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="20"
+     image_name="Nearby_chat_icon"
+     layout="topleft"
+     left="10"
+     name="nearby_chat_icon"
+     top="3"
+     visible="false"
+     width="20"/>
     <layout_stack
      animate="false"
      follows="all"
      height="24"
      layout="topleft"
-     left="9"
+     left="30"
      mouse_opaque="false"
      name="conversation_item_stack"
      orientation="horizontal"
      top="0"
-     width="109">
-      <layout_panel
-        auto_resize="false"
-        name="session_icon_panel"
-        width="24">
-        <avatar_icon
-         follows="top|left"
-         height="20"
-         default_icon_name="Generic_Person"
-         layout="topleft"
-         left="0"
-         top="2"
-         visible="false"
-         width="20" />
-        <group_icon
-         follows="top|left"
-         height="20"
-         default_icon_name="Generic_Group"
-         layout="topleft"
-         left="0"
-         top="2"
-         visible="false"
-         width="20" />
-        </layout_panel>
+     width="90">
         <layout_panel
          auto_resize="false"
          user_resize="false"        
-- 
cgit v1.2.3