From b6c7eee50561b61842252ba3692362ed362e3fae Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Nov 2021 20:20:46 +0200
Subject: SL-16320 Remove references to AvaLine from the viewer

---
 .../default/textures/icons/avaline_default_icon.jpg      | Bin 3951 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml        |   2 --
 indra/newview/skins/default/xui/en/strings.xml           |   2 --
 3 files changed, 4 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/avaline_default_icon.jpg

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

diff --git a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
deleted file mode 100644
index 3bb7f7183c..0000000000
Binary files a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 03878d9fe7..d92c7c1e12 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -67,8 +67,6 @@ with the same filename but different name
   <texture name="Audio_Off" file_name="icons/Audio_Off.png" preload="false" />
   <texture name="Audio_Press" file_name="icons/Audio_Press.png" preload="false" />
 
-  <texture name="Avaline_Icon" file_name="icons/avaline_default_icon.jpg" preload="true" />
-
   <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
 
   <texture name="BackButton_Off" file_name="icons/back_arrow_off.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d115e09d5b..42e402c700 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -341,8 +341,6 @@ can be attached to notecards.
 	<!-- Group name: text shown for LLUUID::null -->
 	<string name="GroupNameNone">(none)</string>
 
-	<string name="AvalineCaller">Avaline Caller [ORDER]</string>
-
 	<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
 	<string name="AssetErrorNone">No error</string>
 	<string name="AssetErrorRequestFailed">Asset request: failed</string>
-- 
cgit v1.2.3


From 493a3a31ffecf0fcdff97429f047a442d82206ba Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Nov 2021 21:38:40 +0200
Subject: SL-16320 Remove obsolete AvaLine strings

---
 indra/newview/skins/default/xui/da/strings.xml | 3 ---
 indra/newview/skins/default/xui/de/strings.xml | 3 ---
 indra/newview/skins/default/xui/es/strings.xml | 3 ---
 indra/newview/skins/default/xui/fr/strings.xml | 3 ---
 indra/newview/skins/default/xui/it/strings.xml | 3 ---
 indra/newview/skins/default/xui/ja/strings.xml | 3 ---
 indra/newview/skins/default/xui/pl/strings.xml | 3 ---
 indra/newview/skins/default/xui/pt/strings.xml | 3 ---
 indra/newview/skins/default/xui/ru/strings.xml | 3 ---
 indra/newview/skins/default/xui/tr/strings.xml | 3 ---
 indra/newview/skins/default/xui/zh/strings.xml | 3 ---
 11 files changed, 33 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index ec6ba4800d..67262c0d0f 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -446,9 +446,6 @@ Prøv venligst om lidt igen.
 	<string name="GroupNameNone">
 		(ingen)
 	</string>
-	<string name="AvalineCaller">
-		Avaline opkalder [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Ingen fejl
 	</string>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 43327c132d..797031ce38 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -677,9 +677,6 @@ nächsten Eigentümer angehängt werden.
 	<string name="GroupNameNone">
 		(keiner)
 	</string>
-	<string name="AvalineCaller">
-		Avaline-Anfrufer [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Kein Fehler
 	</string>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index f5e7d0bf4e..fa022270e1 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -666,9 +666,6 @@ pueden adjuntarse a las notas.
 	<string name="GroupNameNone">
 		(ninguno)
 	</string>
-	<string name="AvalineCaller">
-		Avaline: [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		No hay ningún error
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index f26eac545a..cfb7da44b4 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -678,9 +678,6 @@ peuvent être joints aux notes.
 	<string name="GroupNameNone">
 		(aucun)
 	</string>
-	<string name="AvalineCaller">
-		Appelant Avaline [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Aucune erreur
 	</string>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f0466cea81..b040b37b8c 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -671,9 +671,6 @@ possono essere allegati ai biglietti.
 	<string name="GroupNameNone">
 		(nessuno)
 	</string>
-	<string name="AvalineCaller">
-		Chiamante Avaline [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Nessun errore
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 52d6fb0c2b..46459aa9f2 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -677,9 +677,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupNameNone">
 		（なし）
 	</string>
-	<string name="AvalineCaller">
-		Avaline コール [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		エラーなし
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 91fea234d2..334c44421e 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -599,9 +599,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="GroupNameNone">
 		(brak danych)
 	</string>
-	<string name="AvalineCaller">
-		Avaline [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Brak błędu
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index ee982b5b22..ecbe495a95 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -631,9 +631,6 @@ ser anexado às anotações.
 	<string name="GroupNameNone">
 		(nenhum)
 	</string>
-	<string name="AvalineCaller">
-		Interlocutor Avaline [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Nenhum erro
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index e9592a0476..681a763243 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -675,9 +675,6 @@ support@secondlife.com.
 	<string name="GroupNameNone">
 		(нет)
 	</string>
-	<string name="AvalineCaller">
-		[ORDER] абонента Avaline
-	</string>
 	<string name="AssetErrorNone">
 		Ошибок нет
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 56fad978f5..a5c3f99afe 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -675,9 +675,6 @@ kartlarına eklenebilir.
 	<string name="GroupNameNone">
 		(hiçbiri)
 	</string>
-	<string name="AvalineCaller">
-		Avaline Arayanı [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Hata yok
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index e6c61a5d94..73c5bdb0e6 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -671,9 +671,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="GroupNameNone">
 		（無）
 	</string>
-	<string name="AvalineCaller">
-		Avaline 通話者 [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		無錯誤
 	</string>
-- 
cgit v1.2.3


From 2112abac1bed6155aa8e2b1dcb768db009639d74 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 17 Dec 2021 18:13:20 +0200
Subject: SL-16297 Support the parcel obscure_moap flag.

---
 .../skins/default/xui/en/floater_about_land.xml    | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

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

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 b2d9e53039..2b873bb70a 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1892,7 +1892,29 @@ Only large parcels can be listed in search.
              left="110"
              name="parcel_enable_voice_channel_local"
              width="300" />
-        </panel>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left="10"
+             mouse_opaque="false"
+             name="media"
+             top_pad="10"
+             width="100">
+                Media:
+            </text>
+            <check_box
+             height="16"
+             label="Obscure MOAP"
+             layout="topleft"
+             left="110"
+             left_pad="0"
+             name="obscure_moap"
+             tool_tip="Media on a prim located outside the parcel should not play automatically for an agent within this parcel and vice versa."
+             width="300" />
+            </panel>
         <panel
          border="true"
          follows="all"
-- 
cgit v1.2.3


From e129986a49a9e1ee3ffef8a98a3dc83a310c95c9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 24 Jan 2022 23:36:56 +0200
Subject: SL-3007 Ability to report abuse from chat

---
 indra/newview/skins/default/xui/en/menu_avatar_icon.xml | 7 +++++++
 indra/newview/skins/default/xui/en/menu_url_agent.xml   | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 05ab4d35a0..9f394a4c74 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -96,6 +96,13 @@
      name="Pay">
        <on_click function="AvatarIcon.Action" parameter="pay" />
     </menu_item_call>
+    <menu_item_call
+     label="Report Abuse"
+     layout="topleft"
+     name="Report Abuse">
+       <on_click function="AvatarIcon.Action" parameter="report_abuse" />
+       <on_enable function="AvatarIcon.Enable" parameter="report_abuse" />
+    </menu_item_call>
     <menu_item_check
      label="Block Voice"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index e8b6116026..5ca8be2123 100644
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -29,7 +29,14 @@
      name="remove_friend">
         <menu_item_call.on_click
          function="Url.RemoveFriend" />
-        </menu_item_call>
+    </menu_item_call>
+    <menu_item_call
+     label="Report Abuse"
+     layout="topleft"
+     name="report_abuse">
+        <menu_item_call.on_click
+         function="Url.ReportAbuse" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-- 
cgit v1.2.3


From 3e1a4ac54888a0082f0276ad62f5b2133baa2b2f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Jan 2022 23:17:44 +0200
Subject: SL-16695 Fixed report Abuse floater's screenshot encroaching onto
 tittle

---
 indra/newview/skins/default/xui/en/floater_report_abuse.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_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index d07e3cb31b..f60269ecba 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -19,7 +19,7 @@
      layout="topleft"
      left="60"
      name="screenshot"
-     top="15"
+     top="20"
      width="220" />
     <text
      type="string"
-- 
cgit v1.2.3


From ee238855d180cf6bf533ff44e6af29d540de5b66 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 28 Jan 2022 14:18:25 +0200
Subject: SL-16728 FIXED animations are not stopped after pressing the Alt +
 Shift + A

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 24d06722b9..073bdfc9bb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -423,7 +423,9 @@
         </menu_item_call>       
         <menu_item_call
          label="Stop animations"
-         name="Stop Animating My Avatar">
+         name="Stop Animating My Avatar"
+         allow_key_repeat="true"
+         shortcut="alt|shift|A">
           <menu_item_call.on_click
            function="Tools.StopAllAnimations" />
         </menu_item_call>
-- 
cgit v1.2.3


From bb71cbed04bdda9092abfc0418986be6e504ef5c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 1 Feb 2022 23:51:51 +0200
Subject: SL-16344 #6 Fixed 'choose media' button not working in some cases

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 90f32ae452..594ca08a38 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -498,10 +498,7 @@
 			 top_pad="4"
 			 tool_tip="Add Media"
 			 label="Choose..."
-			 width="85">
-				<button.commit_callback
-				function="BuildTool.AddMedia"/>
-			</button>
+			 width="85"/>
 			<button
 			 follows="top|left"
 			 height="18"
@@ -511,10 +508,7 @@
 			 tool_tip="Delete this media texture"
 			 top_delta="0"
 			 label="Remove"
-			 width="85">
-				<button.commit_callback
-				function="BuildTool.DeleteMedia"/>
-			</button>
+			 width="85"/>
             <button
 			 follows="left|top"
 			 height="18"
-- 
cgit v1.2.3


From cedbf23fd19cb8c155b7e18a922a6da3c317ca1a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 17 Dec 2018 09:58:00 -0500
Subject: SL-10190: Add menu commands to force AV or exception in coroutine.

"Bad memory access" and "unhandled exception" are the two categories of error
that we expect might be different in a coroutine than in the viewer's main
fiber. Without this change, we've had no reliable way to force either of those
to occur.

This will require translation work for two new menu items.

# Conflicts:
#	indra/newview/skins/default/xui/en/menu_viewer.xml
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 073bdfc9bb..add89c4917 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2649,6 +2649,12 @@ function="World.EnvPreset"
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorBadMemoryAccess" />
             </menu_item_call>
+            <menu_item_call
+             label="Force Bad Memory Access in Coroutine"
+             name="Force Bad Memory Access in Coroutine">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorBadMemoryAccessCoro" />
+            </menu_item_call>
             <menu_item_call
              label="Force Infinite Loop"
              name="Force Infinite Loop">
@@ -2668,10 +2674,10 @@ function="World.EnvPreset"
                  function="Advanced.ForceErrorSoftwareException" />
             </menu_item_call>
             <menu_item_call
-             label="Force a Crash in a Coroutine"
-             name="Force a Crash in a Coroutine">
+             label="Force Software Exception in Coroutine"
+             name="Force Software Exception in Coroutine">
                 <menu_item_call.on_click
-                 function="Advanced.ForceErrorCoroutineCrash" />
+                 function="Advanced.ForceErrorSoftwareExceptionCoro" />
             </menu_item_call>
             <menu_item_call
              label="Force a Crash in a Thread"
-- 
cgit v1.2.3


From 1f1d762693027a0f6ce7b913bcc8984767e947be Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 28 Feb 2022 13:18:53 +0200
Subject: SL-16939 FIXED Graphics driver version is not displayed for
 Portuguese language

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

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

diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 5fded9228d..efe887f18e 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -47,7 +47,7 @@ Placa de vídeo: [GRAPHICS_CARD_VENDOR]
 Placa gráfica: [GRAPHICS_CARD]
 	</string>
 	<string name="AboutDriver">
-		Versão do driver de vídeo Windows: [GRAPHICS_CARD_VENDOR]
+		Versão do driver de vídeo Windows: [GRAPHICS_DRIVER_VERSION]
 	</string>
 	<string name="AboutOGL">
 		Versão do OpenGL: [OPENGL_VERSION]
-- 
cgit v1.2.3


From a629e845cfff17a9ab7e74dd3930e1fb63ab286b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 7 Apr 2022 00:54:25 +0300
Subject: SL-17171 Display Marketplace Error Messages only when trying to use
 Marketplace

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

(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 b589d8972b..a024f23885 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2330,6 +2330,14 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	</string>
 	<string name="InventoryMarketplaceError">
 An error occurred while opening Marketplace Listings.
+If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com
+	</string>
+	<string name="InventoryMarketplaceConnectionError">
+Marketplace Listings failed to connect.
+If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com
+	</string>
+	<string name="InventoryMarketplaceConnectionErrorReason">
+Marketplace Listings failed to connect. Reason: [REASON]
 If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com
 	</string>
 	<string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string>
-- 
cgit v1.2.3


From 4cfcbca748e825b4904e7f136fa625b1a0f79dfb Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard.stearns@gmail.com>
Date: Wed, 11 May 2022 18:17:20 -0700
Subject: SL-12238 - error message to match new limits

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

(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 dd8a2cf5fd..b2bf2dee8f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3907,7 +3907,7 @@ Are you sure you want to return objects owned by [USER_NAME]?
 Couldn&apos;t set region textures:
 Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
 
-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
+Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click &quot;Apply&quot; again.
   <tag>fail</tag>
   </notification>
 
@@ -3918,7 +3918,7 @@ Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click
 Couldn&apos;t set region textures:
 Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
 
-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
+Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click &quot;Apply&quot; again.
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 9373f64f49ad9d0676731041466d353274ee51bd Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 17 May 2022 22:14:26 +0300
Subject: SL-3007 Small improvements for auto filling abuse reports

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index f60269ecba..343e72f057 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -11,6 +11,11 @@
      name="Screenshot">
         Screenshot
     </floater.string>
+    <floater.string
+     name="chat_report_format">
+Time: [MSG_TIME]
+Text: [MSG_DESCRIPTION]
+    </floater.string>
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
-- 
cgit v1.2.3


From 397f401a5058732a5947e2676815999cf004c5eb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 20 May 2022 23:19:26 +0300
Subject: SL-17436 Tools floater drops negative Z position for attachments

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 0abee2ff80..46f05fd7bb 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1481,6 +1481,7 @@ even though the user gets a free copy.
              layout="topleft"
              left_delta="0"
              max_val="4096"
+             min_val="-32"
              name="Pos Z"
              text_enabled_color="0 0.8 1 .65"
              top_pad="3"
-- 
cgit v1.2.3


From dd2fe2687ce58c6f6ebf16b2d66ae797022076f6 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 31 May 2022 02:24:14 +0300
Subject: DRTVWR-544 post-merge fix (restored SL-14961)

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1801ccd432..8c38691852 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2673,10 +2673,10 @@ function="World.EnvPreset"
                  function="Advanced.ForceErrorSoftwareException" />
             </menu_item_call>
             <menu_item_call
-             label="Force Software Exception in Coroutine"
-             name="Force Software Exception in Coroutine">
+             label="Force a Crash in a Coroutine"
+             name="Force a Crash in a Coroutine">
                 <menu_item_call.on_click
-                 function="Advanced.ForceErrorSoftwareExceptionCoro" />
+                 function="Advanced.ForceErrorCoroutineCrash" />
             </menu_item_call>
             <menu_item_call
              label="Force a Crash in a Thread"
-- 
cgit v1.2.3


From 3f6c9e2f7a8e1801fefe81f5f740501fda7dba69 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 20 Jul 2022 00:53:37 +0300
Subject: SL-17798 floater now allows 1024 textures

---
 indra/newview/skins/default/xui/da/panel_region_texture.xml | 4 ++--
 indra/newview/skins/default/xui/de/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_region_terrain.xml | 2 +-
 indra/newview/skins/default/xui/es/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/fr/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/it/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/ja/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/pl/panel_region_terrain.xml | 2 +-
 indra/newview/skins/default/xui/pt/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/ru/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/tr/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/zh/panel_region_terrain.xml | 2 +-
 12 files changed, 21 insertions(+), 21 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml
index 45946fd222..c8a3ad328e 100644
--- a/indra/newview/skins/default/xui/da/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml
@@ -7,8 +7,8 @@
 		ukendt
 	</text>
 	<text name="detail_texture_text">
-		Terræn teksturer (kræver 512x512, 24 bit .tga filer)
-	</text>
+    Terræn teksturer (kræver 1024x1024, 24 bit .tga filer)
+  </text>
 	<text name="height_text_lbl">
 		1 (Lav)
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
index 7801be30e4..42ba5b5269 100644
--- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
@@ -10,8 +10,8 @@
 	<spinner label="Obere Terraingrenze" name="terrain_raise_spin"/>
 	<spinner label="Untere Terraingrenze" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 512x512)
-	</text>
+    Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 1024x1024)
+  </text>
 	<text name="height_text_lbl">
 		1 (niedrig)
 	</text>
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 8243c2715d..2aaea04a6d 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -86,7 +86,7 @@
      name="detail_texture_text"
      top="110"
      width="300">
-        Terrain Textures (requires 512x512, 24 bit .tga files)
+        Terrain Textures (requires 1024x1024, 24 bit .tga files)
     </text>
     <texture_picker
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index cb6c03dbb5..9aba5299cb 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -12,8 +12,8 @@ del terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Límite de bajada del 
 terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Texturas del terreno (requiere archivos .tga de 512x512, 24 bits)
-	</text>
+    Texturas del terreno (requiere archivos .tga de 1024x1024, 24 bits)
+  </text>
 	<text name="height_text_lbl">
 		1 (bajo)
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index 97f486d3a3..bbab00ca24 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -12,8 +12,8 @@ terrain" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite d&apos;abaissement 
 du terrain" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Textures du terrain (fichiers .tga 512 x 512, 24 bit requis)
-	</text>
+    Textures du terrain (fichiers .tga 1024 x 1024, 24 bit requis)
+  </text>
 	<text name="height_text_lbl">
 		1 (Bas)
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
index c61ac3ecce..e08c55f63b 100644
--- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
@@ -12,8 +12,8 @@ terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite di abbassamento 
 del terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Texture terreno (richiede file 512x512, 24 bit .tga)
-	</text>
+    Texture terreno (richiede file 1024x1024, 24 bit .tga)
+  </text>
 	<text name="height_text_lbl">
 		1 (basso)
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index fb853c1925..c1080a7d7b 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
@@ -10,8 +10,8 @@
 	<spinner label="地形の上昇限度" name="terrain_raise_spin"/>
 	<spinner label="地形の下降限度" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		地形テクスチャ（512x512 の 24 bit .tga ファイル）
-	</text>
+    地形テクスチャ（1024x1024 の 24 bit .tga ファイル）
+  </text>
 	<text name="height_text_lbl">
 		1（低）
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
index f086a52dcd..2d4286334f 100644
--- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
@@ -7,7 +7,7 @@
 	<spinner label="Górny limit terenu" name="terrain_raise_spin" />
 	<spinner label="Dolny limit terenu" name="terrain_lower_spin" />
 	<text name="detail_texture_text">
-		Tekstury terenu (512x512 / 1024x1024, 24 bitowy plik .tga)
+		Tekstury terenu (1024x1024, 24 bitowy plik .tga)
 	</text>
 	<text name="height_text_lbl">
 		1 (Nisko)
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index 74330a8946..1d312aeed9 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -12,8 +12,8 @@ terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite mais baixo do 
 terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Texturas de terreno (exige arquivos .tga 512x512, 24 bit)
-	</text>
+    Texturas de terreno (exige arquivos .tga 1024x1024, 24 bit)
+  </text>
 	<text name="height_text_lbl">
 		1 (Baixo)
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
index af25565226..76b4f513a8 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
@@ -10,8 +10,8 @@
 	<spinner label="Верх. точка ландшафта" name="terrain_raise_spin"/>
 	<spinner label="Ниж. точка ландшафта" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Текстуры ландшафта (требования: 512x512, 24-битные, TGA)
-	</text>
+    Текстуры ландшафта (требования: 1024x1024, 24-битные, TGA)
+  </text>
 	<text name="height_text_lbl">
 		1 (Низ)
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
index 3226ee008e..e25047301d 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
@@ -10,8 +10,8 @@
 	<spinner label="Yüzey Yükslt. Limiti" name="terrain_raise_spin"/>
 	<spinner label="Yüzey Alçatma Limiti" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Yüzey Dokuları (512x512, 24 bit .tga dosyalar gerektirir)
-	</text>
+    Yüzey Dokuları (1024x1024, 24 bit .tga dosyalar gerektirir)
+  </text>
 	<text name="height_text_lbl">
 		1 (Düşük)
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 85e759e445..81bce46876 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -10,7 +10,7 @@
 	<spinner label="地形提升限制" name="terrain_raise_spin"/>
 	<spinner label="地形降低限制" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		地形材質（須 512x512，24 位元 .tga 檔格式）
+		地形材質（須 1024x1024，24 位元 .tga 檔格式）
 	</text>
 	<text name="height_text_lbl">
 		1（低）
-- 
cgit v1.2.3


From 1cc4e061bb2a59f2003d5e8ae514ae4407800222 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 6 Sep 2022 21:46:47 +0300
Subject: SL-18097 Don't permit multiple instances of 'unsaved changes' popups

Make notifications modal. When multiple ones are visible, first popup works, interacting with second one causes a crash. And it shouldn't be possible to change anything in floater when these notifications are visible
---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(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 1297366b4b..1ddec93668 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1521,7 +1521,7 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
   <notification
    icon="alert.tga"
    name="ProfileUnpublishedClassified"
-   type="alert">
+   type="alertmodal">
     You have unpublished classifieds. They will be lost if you close the window.
     <tag>confirm</tag>
     <usetemplate
@@ -1533,7 +1533,7 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
   <notification
    icon="alert.tga"
    name="ProfileUnsavedChanges"
-   type="alert">
+   type="alertmodal">
     You have usaved changes.
     <tag>confirm</tag>
     <tag>save</tag>
-- 
cgit v1.2.3


From 372e5b6dfad34fa0927dcf0446136aee1e338a19 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 8 Sep 2022 02:18:25 +0300
Subject: SL-3007 Report abuse option in paticipan list

---
 indra/newview/skins/default/xui/en/menu_conversation.xml    | 7 +++++++
 indra/newview/skins/default/xui/en/menu_im_conversation.xml | 7 +++++++
 2 files changed, 14 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index ed362b36e5..59e6106a28 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -132,6 +132,13 @@
         <on_click function="Avatar.DoToSelected" parameter="pay" />
         <on_enable function="Avatar.EnableItem" parameter="can_pay" />
     </menu_item_call>
+    <menu_item_call
+     label="Report Abuse"
+     layout="topleft"
+     name="report_abuse">
+       <on_click function="Avatar.DoToSelected" parameter="report_abuse" />
+       <on_enable function="Avatar.EnableItem" parameter="report_abuse" />
+    </menu_item_call>
     <menu_item_check
      label="Block Voice"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
index 43287c6ec3..b38fae4404 100644
--- a/indra/newview/skins/default/xui/en/menu_im_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
@@ -79,6 +79,13 @@
     </menu_item_call>
     <menu_item_separator
      layout="topleft"/>
+    <menu_item_call
+     label="Report Abuse"
+     layout="topleft"
+     name="Report Abuse">
+       <on_click function="Avatar.GearDoToSelected" parameter="report_abuse" />
+       <on_enable function="Avatar.EnableGearItem" parameter="report_abuse" />
+    </menu_item_call>
     <menu_item_check
      label="Block Voice"
      layout="topleft"
-- 
cgit v1.2.3