From c7bd4528a7bc295a17a12951389fcc499483f6c5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Jun 2024 19:18:23 +0300
Subject: viewer#1131 gltf model upload UI WIP

---
 .../default/xui/en/floater_gltf_asset_editor.xml    | 21 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml  |  8 ++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
new file mode 100644
index 0000000000..9082486d84
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ default_tab_group="1"
+ height="891"
+ width="256"
+ min_height="500"
+ min_width="256"
+ layout="topleft"
+ name="gltf asset editor"
+ title="[OBJECT_NAME]">
+    <panel
+     bottom="-1"
+     follows="all"
+     layout="topleft"
+     name="item_list_panel"
+     top_pad="0"
+     left="5"
+     right="-1"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d5d2d00630..347638249b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2851,6 +2851,14 @@ function="World.EnvPreset"
           <menu_item_call.on_click
            function="Advanced.ClickGLTFUpload" />
         </menu_item_call>
+        <menu_item_call
+         label="Edit..."
+         name="Edit...">
+          <menu_item_call.on_enable
+             function="EnableGLTFUpload"/>
+          <menu_item_call.on_click
+           function="Advanced.ClickGLTFEdit" />
+        </menu_item_call>
       </menu>
       <menu
          create_jump_keys="true"
-- 
cgit v1.2.3


From e75595a1c193abb95075b27ab5641a3b28556c2e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 Jun 2024 18:03:30 +0300
Subject: viewer#1131 gltf model upload UI WIP #2

---
 .../skins/default/xui/en/floater_gltf_asset_editor.xml    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
index 9082486d84..4dc0dffcfd 100644
--- a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
@@ -3,19 +3,24 @@
  legacy_header_height="18"
  can_resize="true"
  default_tab_group="1"
- height="891"
+ height="400"
  width="256"
- min_height="500"
- min_width="256"
+ min_height="200"
+ min_width="200"
  layout="topleft"
  name="gltf asset editor"
  title="[OBJECT_NAME]">
+    <floater.string name="scene_tittle" value="Scene"/>
+    <floater.string name="node_tittle" value="Node"/>
+    <floater.string name="mesh_tittle" value="Mesh"/>
+    <floater.string name="skin_tittle" value="Skin"/>
     <panel
-     bottom="-1"
      follows="all"
      layout="topleft"
      name="item_list_panel"
-     top_pad="0"
+     visible="true"
+     bottom="-1"
+     top="16"
      left="5"
      right="-1"/>
 </floater>
-- 
cgit v1.2.3


From 279ec534dd999420544b672cf84841b86d1306ae Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 1 Jul 2024 17:10:13 +0300
Subject: viewer#1131 gltf model upload UI WIP #3

---
 .../default/xui/en/floater_gltf_asset_editor.xml   | 271 ++++++++++++++++++++-
 1 file changed, 264 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
index 4dc0dffcfd..82e0e325fb 100644
--- a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
@@ -3,9 +3,9 @@
  legacy_header_height="18"
  can_resize="true"
  default_tab_group="1"
- height="400"
+ height="530"
  width="256"
- min_height="200"
+ min_height="400"
  min_width="200"
  layout="topleft"
  name="gltf asset editor"
@@ -14,13 +14,270 @@
     <floater.string name="node_tittle" value="Node"/>
     <floater.string name="mesh_tittle" value="Mesh"/>
     <floater.string name="skin_tittle" value="Skin"/>
-    <panel
+
+    <layout_stack
+     name="main_layout"
+     orientation="vertical"
      follows="all"
-     layout="topleft"
-     name="item_list_panel"
-     visible="true"
      bottom="-1"
      top="16"
      left="5"
-     right="-1"/>
+     right="-1"
+     border_size="0">
+
+        <layout_panel
+         name="top_lp"
+         border="true"
+         bevel_style="in"
+         auto_resize="false"
+         user_resize="true"
+         visible="true"
+         height="200">
+            <panel
+             follows="all"
+             layout="topleft"
+             name="item_list_panel"
+             visible="true"
+             bottom="-1"
+             top="16"
+             left="5"
+             right="-1"/>
+        </layout_panel>
+
+        <layout_panel
+         name="transforms_panel"
+         border="true"
+         bevel_style="in"
+         auto_resize="true"
+         user_resize="true"
+         visible="true"
+         height="150">
+            <menu_button
+             menu_filename="menu_copy_paste_pos.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
+             layout="topleft"
+             left_delta="0"
+             top_pad="13"
+             name="clipboard_pos_btn"
+             tool_tip="Paste options"
+             width="19"/>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             name="label position"
+             tool_tip="Position (meters)"
+             left_pad="8"
+             top_delta="0"
+             width="121">
+                Position (m)
+            </text>
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="X"
+             label_width="10"
+             layout="topleft"
+             left_delta="-27"
+             max_val="512"
+             min_val="-256"
+             name="Pos X"
+             text_enabled_color="1 0 0.3 .7"
+             top_pad="8"
+             width="87" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Y"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="512"
+             min_val="-256"
+             name="Pos Y"
+             text_enabled_color="EmphasisColor"
+             top_pad="3"
+             width="87" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Z"
+             label_width="10"
+             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"
+             width="87" />
+            <menu_button
+             menu_filename="menu_copy_paste_size.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
+             layout="topleft"
+             left_delta="0"
+             top_pad="13"
+             name="clipboard_size_btn"
+             tool_tip="Paste options"
+             width="19"/>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="8"
+             top_delta="0"
+             name="label size"
+             tool_tip="Size (meters)"
+             width="121">
+                Size (m)
+            </text>
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="X"
+             label_width="10"
+             layout="topleft"
+             left_delta="-27"
+             max_val="64"
+             min_val="0.01"
+             name="Scale X"
+             text_enabled_color="1 1 1 1"
+             top_pad="8"
+             width="87" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Y"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="64"
+             min_val="0.01"
+             name="Scale Y"
+             text_enabled_color="1 1 1 1"
+             top_pad="3"
+             width="87" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Z"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="64"
+             min_val="0.01"
+             name="Scale Z"
+             text_enabled_color="1 1 1 1"
+             top_pad="3"
+             width="87" />
+            <menu_button
+             menu_filename="menu_copy_paste_rot.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
+             layout="topleft"
+             left_delta="0"
+             top_pad="13"
+             name="clipboard_rot_btn"
+             tool_tip="Paste options"
+             width="19"/>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="8"
+             top_delta="0"
+             name="label rotation"
+             tool_tip="Rotation (degrees)"
+             width="121">
+                Rotation (°)
+            </text>
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="0"
+             label="X"
+             label_width="10"
+             layout="topleft"
+             left_delta="-27"
+             max_val="9999"
+             min_val="-9999"
+             name="Rot X"
+             text_enabled_color="1 1 1 1"
+             top_pad="8"
+             width="87" />
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="0"
+             label="Y"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="9999"
+             min_val="-9999"
+             name="Rot Y"
+             text_enabled_color="1 1 1 1"
+             top_pad="3"
+             width="87" />
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="0"
+             label="Z"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="9999"
+             min_val="-9999"
+             name="Rot Z"
+             text_enabled_color="1 1 1 1"
+             top_pad="3"
+             width="87" />
+        </layout_panel>
+
+        <layout_panel
+         name="blank_panel"
+         border="true"
+         bevel_style="in"
+         auto_resize="true"
+         user_resize="true"
+         visible="false"
+         height="150">
+        </layout_panel>
+    </layout_stack>
 </floater>
-- 
cgit v1.2.3


From b940fbc0d4b78534780de33dc9f7d41535de5ae3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 1 Jul 2024 19:01:20 +0300
Subject: viewer#1131 MacOS build fixes and small adjustments

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
index 82e0e325fb..b17d0aa5b6 100644
--- a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
@@ -10,6 +10,7 @@
  layout="topleft"
  name="gltf asset editor"
  title="[OBJECT_NAME]">
+    <floater.string name="floater_title" value="GLTF Scene Editor"/>
     <floater.string name="scene_tittle" value="Scene"/>
     <floater.string name="node_tittle" value="Node"/>
     <floater.string name="mesh_tittle" value="Mesh"/>
@@ -39,7 +40,7 @@
              name="item_list_panel"
              visible="true"
              bottom="-1"
-             top="16"
+             top="1"
              left="5"
              right="-1"/>
         </layout_panel>
@@ -60,8 +61,8 @@
              image_selected="ClipboardSmallMenu_Press"
              image_unselected="ClipboardSmallMenu_Off"
              layout="topleft"
-             left_delta="0"
-             top_pad="13"
+             left="4"
+             top="10"
              name="clipboard_pos_btn"
              tool_tip="Paste options"
              width="19"/>
-- 
cgit v1.2.3


From 2ea5ac0c43e3e28d2b1774f5367d099271a1da32 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 1 Jul 2024 13:34:50 +0200
Subject: #1111 Remove xmlrpc-epi

---
 indra/newview/skins/default/xui/da/floater_about.xml | 1 -
 indra/newview/skins/default/xui/de/floater_about.xml | 1 -
 indra/newview/skins/default/xui/en/floater_about.xml | 1 -
 indra/newview/skins/default/xui/es/floater_about.xml | 1 -
 indra/newview/skins/default/xui/fr/floater_about.xml | 1 -
 indra/newview/skins/default/xui/it/floater_about.xml | 1 -
 indra/newview/skins/default/xui/ja/floater_about.xml | 1 -
 indra/newview/skins/default/xui/pt/floater_about.xml | 1 -
 indra/newview/skins/default/xui/ru/floater_about.xml | 1 -
 indra/newview/skins/default/xui/tr/floater_about.xml | 1 -
 indra/newview/skins/default/xui/zh/floater_about.xml | 1 -
 11 files changed, 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index 7bcae69779..604eb7c58f 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -69,7 +69,6 @@ OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
 PCRE Copyright (c) 1997-2008 University of Cambridge
 SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
 SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
 xxHash Copyright (C) 2012-2020 Yann Collet.
 zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 google-perftools Copyright (c) 2005, Google Inc.
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 10ccf0d5da..320db7f654 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -28,7 +28,6 @@ mit Open-Source-Beiträgen von:</text>
         PCRE Copyright (c) 1997-2012 University of Cambridge.
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga.
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com).
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Copyright (C) 1995-2012 Jean-loup Gailly und Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index ff2fa93cbb..126cd84d56 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -111,7 +111,6 @@ Dummy Name replaced at run time
         PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index e14ba32f69..8103a95376 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -28,7 +28,6 @@ con contribuciones de código abierto de:</text>
         PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Copyright (C) 1995-2012 Jean-loup Gailly y Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 09da1fb5fd..b6ea621177 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -28,7 +28,6 @@ avec les contributions Open Source de :</text>
         PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Copyright (C) 1995-2012 Jean-Loup Gailly et Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 7e195d3ca9..77be47d749 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -28,7 +28,6 @@ con contributi open source da:</text>
         PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Copyright (C) 1995-2012 Jean-loup Gailly e Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 12d763be37..6cd22f6a31 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -33,7 +33,6 @@ OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
 PCRE Copyright (c) 1997-2012 University of Cambridge
 SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
 SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
 xxHash Copyright (C) 2012-2020 Yann Collet.
 zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index aaed728f84..0e95c53109 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -28,7 +28,6 @@ com contribuições de código aberto de:</text>
         PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index a65a979ccd..22827bc397 100644
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -28,7 +28,6 @@
         PCRE (c) 1997-2012, Кембриджский университет
         SDL (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib (C) 1995-2012 Jean-loup Gailly и Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 40ca3707c3..ca21bee464 100644
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -28,7 +28,6 @@ açık kaynak kod katkısında bulunanlar şunlardır:</text>
         PCRE Telif Hakkı (c) 1997-2012 University of Cambridge
         SDL Telif Hakkı (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Telif Hakkı (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Telif Hakkı (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Telif Hakkı (C) 1995-2012 Jean-loup Gailly ve Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index a56ae753d1..727f598894 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -28,7 +28,6 @@
         PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
-- 
cgit v1.2.3


From cb2795748eec373b11154c2825a3ecf2633938be Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 2 Jul 2024 19:01:46 +0300
Subject: viewer#1905 Fix "Share" and "Pay" buttons' state in nearby list

---
 .../newview/skins/default/xui/en/menu_people_nearby_multiselect.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 63185b537c..61738e73db 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -48,6 +48,9 @@
      name="share">
         <on_click
          function="Avatar.Share" />
+        <on_enable
+         function="Avatar.EnableItem"
+         parameter="can_share" />
     </menu_item_call>
     <menu_item_call
      enabled="false"
@@ -56,6 +59,9 @@
      name="pay">
         <on_click
          function="Avatar.Pay" />
+        <on_enable
+         function="Avatar.EnableItem"
+         parameter="can_pay" />
     </menu_item_call>
     <menu_item_call
     label="Offer Teleport"
-- 
cgit v1.2.3


From 1adb94a89c106176e01d950170b9c4d623dd2250 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 2 Jul 2024 20:39:39 +0300
Subject: viewer#1666 Allow switching 2k textures off in bulk uploads

---
 .../skins/default/xui/en/floater_bulk_upload.xml   | 144 +++++++++++++++++++++
 .../newview/skins/default/xui/en/notifications.xml |  11 --
 2 files changed, 144 insertions(+), 11 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_bulk_upload.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_upload.xml b/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
new file mode 100644
index 0000000000..4c639a7c65
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ can_resize="false"
+ show_title="false"
+ can_minimize="false"
+ can_close="false"
+ header_height="10"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ height="207"
+ layout="topleft"
+ name="bulk_upload"
+ width="430">
+    <layout_stack
+      follows="all"
+      height="203"
+      layout="topleft"
+      left="8"
+      animate="false"
+      top="1"
+      orientation="vertical"
+      name="maint_layout"
+      width="421">
+        <layout_panel
+          follows="all"
+          height="27"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="count_panel">
+            <text
+             follows="left|top"
+             layout="topleft"
+             top="6"
+             left="20"
+             name="number_of_items"
+             height="20"
+             wrap="true">
+                Number of items to upload: [COUNT]
+            </text>
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="37"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="warning_panel">
+            <text
+             name="textures_2k_warning"
+             follows="left|top"
+             layout="topleft"
+             top="6"
+             left="20"
+             height="30"
+             right="-20"
+             wrap="true">
+                Because of their dimentions one or more selected textures will be scaled to 2048px.
+            </text>
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="23"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="checkbox_panel">
+            <check_box
+             height="16"
+             left="20"
+             label="Scale textures to a maximum of 1024px"
+             layout="topleft"
+             name="upload_2k" />
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="27"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="cost_panel">
+            <text
+             name="upload_cost"
+             follows="left|top"
+             layout="topleft"
+             font.style="BOLD"
+             top="6"
+             left="20"
+             height="20"
+             wrap="true">
+                Upload cost: L$[COST]
+            </text>
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="29"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="buttoms_panel">
+            <button
+             follows="bottom|left|right"
+             height="23"
+             label="Upload"
+             layout="topleft"
+             mouse_opaque="false"
+             name="upload_btn"
+             top="1"
+             left="84"
+             width="120" />
+            <button
+             follows="bottom|left|right"
+             height="23"
+             label="Cancel"
+             layout="topleft"
+             left_pad="12"
+             top_delta="0"
+             mouse_opaque="false"
+             name="cancel_btn"
+             width="120" />
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="40"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="link_panel">
+            <text
+             follows="left|top"
+             layout="topleft"
+             top="6"
+             left="20"
+             name="new_folder_textbox"
+             height="39"
+             parse_urls="true"
+             skip_link_underline="true"
+             wrap="true">
+How textures are scaled during upload:
+https://wiki.secondlife.com/wiki/Limits#All_Viewers
+            </text>
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f86b297395..a1e25f48ed 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9060,17 +9060,6 @@ Your voice has been muted by moderator.
           name="okbutton"
           yestext="OK"/>
     </notification>
-
-   <notification
-    icon="alertmodal.tga"
-    name="BulkUploadCostConfirmation"
-    type="alertmodal">
-This will upload [COUNT] items at a total cost of L$[COST]. Do you wish to continue with the upload?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Upload"/>
-   </notification>
   
    <notification
     icon="alertmodal.tga"
-- 
cgit v1.2.3


From b63065486b6e24a8518f95b95e0a5ca91a3eec28 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 2 Jul 2024 21:10:48 +0300
Subject: viewer#1666 Make warning universal to avoid shifting notification

---
 indra/newview/skins/default/xui/en/floater_bulk_upload.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_bulk_upload.xml b/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
index 4c639a7c65..b2d03a5d04 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
@@ -55,7 +55,7 @@
              height="30"
              right="-20"
              wrap="true">
-                Because of their dimentions one or more selected textures will be scaled to 2048px.
+                By default, one or more selected textures will be scaled to 2048px.
             </text>
         </layout_panel>
         <layout_panel
-- 
cgit v1.2.3


From 77a8bd878bad5a28472eda8b8c7dff33ca5e3d10 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 4 Jul 2024 16:37:07 +0300
Subject: viewer#1916 Updated default Chat Window behavior

---
 indra/newview/skins/default/xui/en/floater_im_container.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_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 4df29c47de..176a2ca1a4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -14,7 +14,7 @@
  reuse_instance="true"
  title="CONVERSATIONS"
  bottom="-50"
- right="-5"
+ left="5"
  width="450"
  min_width="38">
     <string
-- 
cgit v1.2.3


From ef9a494134458f3464b250c87da9e247d775989c Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sun, 14 Jul 2024 12:01:30 +0200
Subject: #1500 Better out of disk space handling

---
 indra/newview/skins/default/xui/en/notifications.xml | 9 +++++++++
 1 file changed, 9 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 a1e25f48ed..3ba4f2f3e4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3031,6 +3031,15 @@ This is usually a temporary failure. Please customize and save the wearable agai
   <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="OutOfDiskSpace"
+   type="notifytip">
+The system is out of disk space. You will need to free up some space on your computer or clear the cache.
+<tag>fail</tag>
+    <unique/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="YouHaveBeenLoggedOut"
-- 
cgit v1.2.3


From ace506cc8aec370b739b40ab2afa7c1fef4cc030 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 18 Jul 2024 07:38:36 +0300
Subject: viewer#1997 Warn user if closing appearance with unsaved changes

---
 indra/newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++
 1 file changed, 14 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 3ba4f2f3e4..2c19a89fb2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4261,6 +4261,20 @@ Unable to add estate manager [AGENT] to banned list.
 Can&apos;t change appearance until clothing and shape are loaded.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="UsavedWearableChanges"
+   type="alertmodal">
+You have unsaved changes.
+      <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm before I discard unsaved wearable changes"
+     name="okcancelignore"
+     notext="Keep Editing"
+     yestext="Discard"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ClassifiedMustBeAlphanumeric"
-- 
cgit v1.2.3


From df459684d430910e44ddb1abc6f231c6d460442f Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 24 Jul 2024 15:02:09 -0400
Subject: Fix warning/misnamed button image PushButton_Disabled_Selected to
 PushButton_Selected_Disabled

---
 indra/newview/skins/default/xui/en/panel_scrolling_param.xml | 4 ++--
 indra/newview/skins/default/xui/en/widgets/drop_down.xml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 2035bc2caa..ec642131ae 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -84,7 +84,7 @@
      enabled="false"
      height="132"
      image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled_Selected"
+     image_disabled_selected="PushButton_Selected_Disabled"
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      layout="topleft"
@@ -97,7 +97,7 @@
      enabled="false"
      height="132"
      image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled_Selected"
+     image_disabled_selected="PushButton_Selected_Disabled"
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
index 75ed485645..80f98b64fc 100644
--- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml
+++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
@@ -12,7 +12,7 @@
                           image_unselected="PushButton_Off"
                           image_selected="PushButton_Selected"
                           image_disabled="PushButton_Disabled"
-                          image_disabled_selected="PushButton_Disabled_Selected"
+                          image_disabled_selected="PushButton_Selected_Disabled"
                           image_overlay="Combobox_Over"
                           image_overlay_alignment="right" />
   <drop_down.combo_list bg_writeable_color="white" />
-- 
cgit v1.2.3


From 4d7f622a3c6a2fdec1c57ad4506ae49786b37dfc Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:02:03 +0300
Subject: viewer#2065 Region restart schedule floater

---
 .../xui/en/floater_region_restart_schedule.xml     | 278 +++++++++++++++++++++
 .../skins/default/xui/en/panel_region_general.xml  |  14 +-
 2 files changed, 291 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml b/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml
new file mode 100644
index 0000000000..fd04acde35
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  height="180"
+  layout="topleft"
+  name="floater_region_restart_schedule"
+  help_topic="Preferences_Graphics_Advanced"
+  single_instance="true"
+  save_rect="true"
+  title="REGION RESTART SCHEDULE"
+  width="300">
+
+<!-- This block shows Advanced Settings -->
+  <floater.string name="am_string">am</floater.string>
+  <floater.string name="pm_string">pm</floater.string>
+
+  <text
+    name="days_general"
+    type="string"
+    follows="left|top"
+    layout="topleft"
+    height="16"
+    top="15"
+    left="20"
+    width="328">
+     Restart the region on following days:
+  </text>
+
+  <check_box
+   name="s_chk"
+   label=""
+   tool_tip="Sunday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left="60"
+   top_pad="5" />
+
+  <check_box
+   name="m_chk"
+   label=""
+   tool_tip="Monday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="t_chk"
+   label=""
+   tool_tip="Tuesday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="w_chk"
+   label=""
+   tool_tip="Wednesday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="r_chk"
+   label=""
+   tool_tip="Thursday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="f_chk"
+   label=""
+   tool_tip="Friday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="a_chk"
+   label=""
+   tool_tip="Saturday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <text
+   name="su_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_pad="5"
+   left="57"
+   width="25">
+     Su
+  </text>
+
+  <text
+   name="mo_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Mo
+  </text>
+
+  <text
+   name="tu_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Tu
+  </text>
+
+  <text
+   name="we_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="1"
+   width="25">
+     We
+  </text>
+
+  <text
+   name="th_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Th
+  </text>
+
+  <text
+   name="fr_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Fr
+  </text>
+
+  <text
+   name="sa_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Sa
+  </text>
+
+  <text
+   name="at_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="right"
+   height="16"
+   top_pad="15"
+   left="30"
+   width="40">
+     at
+  </text>
+  <line_editor
+   name="hours_edt"
+   max_length_bytes="2"
+   follows="left|top"
+   layout="topleft"
+   commit_on_focus_lost="true"
+   height="23"
+   width="40"
+   left_pad="4"
+   top_delta="-5"/>
+  <text
+   name="separator_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="5"
+   left_pad="0"
+   width="12">
+     :
+  </text>
+  <line_editor
+   name="minutes_edt"
+   max_length_bytes="2"
+   follows="left|top"
+   layout="topleft"
+   commit_on_focus_lost="true"
+   height="23"
+   width="40"
+   left_pad="0"
+   top_delta="-5"/>
+  <button
+   name="am_pm_btn"
+   label="am"
+   follows="left|top"
+   layout="topleft"
+   height="23"
+   width="40"
+   left_pad="1"
+   top_delta="0"/>
+  <text
+   name="utc_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   height="16"
+   top_delta="5"
+   left_pad="5"
+   width="22">
+     UTC
+  </text>
+  <button
+   name="save_btn"
+   label="Save"
+   follows="top|left"
+   layout="topleft"
+   top="145"
+   left="25"
+   height="25"
+   width="110"/>
+  <button
+   name="cancel_btn"
+   label="Cancel"
+   follows="bottom|right"
+   layout="topleft"
+   left_pad="20"
+   top_delta="0"
+   height="25"
+   width="110"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 74d21c436e..6ef1b6e44a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -270,8 +270,20 @@
      left="250"
      name="manage_telehub_btn"
      top="70"
-     width="150">
+     width="160">
 		<button.commit_callback
          function="RegionInfo.ManageTelehub" />
     </button>
+    <button
+     follows="left|top"
+     height="20"
+     label="Manage Restart Schedule..."
+     layout="topleft"
+     name="manage_restart_btn"
+     top_pad="5"
+     left_delta="0"
+     width="160">
+        <button.commit_callback
+         function="RegionInfo.ManageRestart" />
+    </button>
 </panel>
-- 
cgit v1.2.3


From 10e5e5694668a5376378dc487b54f1045080e47e Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 25 Jul 2024 23:24:39 -0400
Subject: Reduce findChild stalls in appearance floater

---
 indra/newview/skins/default/xui/en/panel_edit_alpha.xml | 5 -----
 1 file changed, 5 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 30fee7361f..ab0e447028 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -33,7 +33,6 @@
       top="0"
       width="313" >
        <check_box
-        control_name="LowerAlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
@@ -58,7 +57,6 @@
        </texture_picker>
 
        <check_box
-        control_name="UpperAlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
@@ -83,7 +81,6 @@
        </texture_picker>
 
        <check_box
-        control_name="HeadAlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
@@ -108,7 +105,6 @@
        </texture_picker>
 
        <check_box
-        control_name="Eye AlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
@@ -133,7 +129,6 @@
        </texture_picker>
 
        <check_box
-        control_name="HairAlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
-- 
cgit v1.2.3


From fceec45641cf6a4b7eecaf37ea080a184c279239 Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <Ansariel@users.noreply.github.com>
Date: Sat, 27 Jul 2024 17:10:17 +0200
Subject: Fix a bunch of XUI warnings (#2120)

---
 indra/newview/skins/default/xui/en/floater_im_session.xml     | 1 -
 indra/newview/skins/default/xui/en/widgets/emoji_complete.xml | 1 -
 2 files changed, 2 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 738d448f00..7b06bed0a3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -341,7 +341,6 @@
                  name="emoji_recent_empty_text"
                  follows="top|left|right"
                  layout="topleft"
-                 auto_resize="false"
                  h_pad="20"
                  v_pad="10"
                  top="0"
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
index 6cc8d7118f..4a1ba169ad 100644
--- a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <emoji_complete
   autosize="false"
-  hover_image="ListItem_Over"
   selected_image="ListItem_Select"
   max_visible="7"
   padding="8"
-- 
cgit v1.2.3


From ed6148d6c6c554223dc4b2dab0c729d3b5698158 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 26 Jul 2024 21:49:36 +0300
Subject: viewer#2113 Optional disable eyes/head follow cursor/lookat

Intended for photography, but there is curently no nice way to present
it so it's in debug options until we get some critical mass of features
that can be collected into a single whole.
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(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 347638249b..941f0c6bb7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3966,6 +3966,16 @@ function="World.EnvPreset"
                      function="ToggleControl"
                      parameter="AllowSelectAvatar" />
                 </menu_item_check>
+                <menu_item_check
+                 label="Disable Look At Animation"
+                 name="Disable Look At Animation">
+                    <menu_item_check.on_check
+                     function="CheckControl"
+                     parameter="DisableLookAtAnimation" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="DisableLookAtAnimation" />
+                </menu_item_check>
                 <menu_item_check
                  label="Render Only Friends"
                  name="Render Only Friends">
-- 
cgit v1.2.3


From c3b678276dadb7aded8e8aeb3742524766f5ad8a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 30 Jul 2024 18:57:46 +0300
Subject: viewer#2144 Correct unclear terminilogy in region's debug panel

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 04a510d4e8..be8468a15c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -140,7 +140,7 @@
      layout="topleft"
      left_delta="0"
      name="return_other_land"
-     tool_tip="Return only objects which are on land belonging to someone else"
+     tool_tip="Return only objects which are on land that isn't owned by selected user"
      top_delta="20"
      width="80" />
     <check_box
-- 
cgit v1.2.3


From 593479f33cecd81148a861c93c3f889e1ee5dc20 Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <Ansariel@users.noreply.github.com>
Date: Sat, 3 Aug 2024 00:24:41 +0200
Subject: Display parcel name when clicking on a parcel on the world map
 (#2131)

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 7efa81d263..b0b818cde5 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -14,6 +14,9 @@
  single_instance="true"
  title="WORLD MAP"
  width="650">
+  <string name="UnnamedParcel">
+    (Unnamed Parcel)
+  </string>
   <string
    name="collapse_icon"
    value="map_ui_collapse_icon.png"/>
-- 
cgit v1.2.3


From 874794ea584588457dfde7ef17c447e2a0eb46bb Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 4 Aug 2024 21:00:10 -0400
Subject: Add LLUIColorTable debug-settings-like floater for easing skin design

---
 .../default/xui/en/floater_settings_color.xml      | 117 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_login.xml  |   7 ++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   7 ++
 3 files changed, 131 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_settings_color.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_color.xml b/indra/newview/skins/default/xui/en/floater_settings_color.xml
new file mode 100644
index 0000000000..0722677f1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_settings_color.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+    legacy_header_height="18"
+    can_minimize="false"
+    height="360"
+    min_height="367"
+    layout="topleft"
+    name="settings_color"
+    help_topic="settings_color"
+    title="COLOR SETTINGS"
+    reuse_instance="true"
+    can_resize="true"
+    min_width="550"
+    width="570">
+    <filter_editor
+        follows="left|top|right"
+        height="23"
+        layout="topleft"
+        left="10"
+        right="-10"
+        label="Enter search text"
+        max_length_chars="300"
+        name="filter_input"
+        text_pad_left="10"
+        top="30" />
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        draw_stripes="false"
+        heading_height="23"
+        height="266"
+        layout="topleft"
+        search_column="1"
+        sort_column="1"
+        left="10"
+        follows="left|top|bottom"
+        name="setting_list"
+        top_pad="2"
+        width="300">
+        <scroll_list.columns
+            name="changed_color"
+            relative_width="0.05" />
+        <scroll_list.columns
+            label="Color"
+            name="color" />
+    </scroll_list>
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="color_name_txt"
+        font="SansSerifSmallBold"
+        top_delta="8"
+        left_pad="10"
+        visible="true"
+        use_ellipses="true"
+        text_color="White"
+        width="240">
+        Color name
+    </text>
+    <color_swatch
+        top_pad="0"
+        left_delta="0"
+        follows="top|left"
+        can_apply_immediately="true"
+        height="180"
+        name="color_swatch"
+        visible="true"
+        layout="topleft"
+        width="240">
+        <color_swatch.commit_callback
+            function="CommitSettings" />
+    </color_swatch>
+    <spinner
+        height="20"
+        label="Alpha"
+        layout="topleft"
+        follows="top|left"
+        left_delta="0"
+        min_val="0"
+        max_val="1"
+        decimal_digits="3"
+        name="alpha_spinner"
+        top_pad="5"
+        visible="true"
+        width="120">
+        <spinner.commit_callback
+            function="CommitSettings" />
+    </spinner>
+    <button
+        height="22"
+        label="Reset to default"
+        follows="left|top"
+        layout="topleft"
+        left_delta="0"
+        name="default_btn"
+        visible="true"
+        top_pad="15"
+        width="150">
+        <button.commit_callback
+            function="ClickDefault" />
+    </button>
+    <check_box
+        control_name="ColorSettingsHideDefault"
+        height="16"
+        initial_value="true"
+        label="Show changed colors only"
+        layout="topleft"
+        top_pad="10"
+        left="10"
+        follows="left|bottom"
+        name="hide_default"
+        width="330">
+    </check_box>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index a71cbde21b..1d1b81e31a 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -149,6 +149,13 @@
              function="Advanced.ShowDebugSettings"
              parameter="all" />
         </menu_item_call>
+        <menu_item_call
+         label="Show Color settings"
+         name="Color Settings">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="settings_color" />
+        </menu_item_call>
         <menu_item_separator />
         <menu_item_call
          label="XUI Preview Tool"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 941f0c6bb7..f7b10a376e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3829,6 +3829,13 @@ function="World.EnvPreset"
          label="XUI"
          name="XUI"
          tear_off="true">
+            <menu_item_call
+             label="Show Color settings"
+             name="Color Settings">
+                <menu_item_call.on_click
+                 function="Floater.Toggle"
+                 parameter="settings_color" />
+            </menu_item_call>
             <menu_item_call
                label="Reload Color Settings"
                name="Reload Color Settings">
-- 
cgit v1.2.3


From 6aa9110b2ae346da1a396500cae1b41e8e2d5b75 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Thu, 11 Jul 2024 15:54:24 -0700
Subject: secondlife/viewer#1883: Local-only PBR terrain paintmap with
 developer tools

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 38 ++++++++++++++++++----
 1 file changed, 31 insertions(+), 7 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 941f0c6bb7..98cf03b30e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3435,13 +3435,6 @@ function="World.EnvPreset"
             <menu_item_call.on_click
              function="Advanced.ClearShaderCache" />
           </menu_item_call>
-          <menu_item_call
-            enabled="true"
-            label="Rebuild Terrain"
-            name="Rebuild Terrain">
-            <menu_item_call.on_click
-             function="Advanced.RebuildTerrain" />
-          </menu_item_call>
           <menu_item_separator />
           <menu_item_call
             enabled="true"
@@ -3662,6 +3655,37 @@ function="World.EnvPreset"
                  function="Advanced.ResetInterestLists" />
 			</menu_item_call>
 		</menu>
+        <!-- terrain -->
+        <menu
+         create_jump_keys="true"
+         label="Terrain"
+         name="DevelopTerrain"
+         tear_off="true">
+            <menu_item_call
+              enabled="true"
+              label="Rebuild Terrain"
+              name="Rebuild Terrain">
+              <menu_item_call.on_click
+               function="Advanced.RebuildTerrain" />
+            </menu_item_call>
+
+            <menu_item_separator/>
+
+            <menu_item_call
+              enabled="true"
+              label="Create Local Paintmap"
+              name="Create Local Paintmap">
+              <menu_item_call.on_click
+               function="Advanced.TerrainCreateLocalPaintMap" />
+            </menu_item_call>
+            <menu_item_call
+              enabled="true"
+              label="Delete Local Paintmap"
+              name="Delete Local Paintmap">
+              <menu_item_call.on_click
+               function="Advanced.TerrainDeleteLocalPaintMap" />
+            </menu_item_call>
+		</menu>
         <menu
          create_jump_keys="true"
          label="UI"
-- 
cgit v1.2.3


From ba2b77d0882f8ca3ef0ae95ca9d388aa217f9a7a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 18 Aug 2024 15:35:33 -0400
Subject: Fix findChild during draw in preference floater

---
 indra/newview/skins/default/xui/en/panel_preferences_alerts.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index fb528bf98f..425cbb6f44 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -69,7 +69,6 @@
      sort_ascending="true" 
      width="495" />
 	 <button
-	 enabled_control="FirstSelectedDisabledPopups"
      follows="top|left"
      height="23"
      image_overlay="Arrow_Up"
@@ -83,7 +82,6 @@
          function="Pref.ClickEnablePopup" />
     </button>
     <button
-	 enabled_control="FirstSelectedEnabledPopups"
 	 follows="top|left"
      height="23"
      image_overlay="Arrow_Down"
-- 
cgit v1.2.3


From 627d512c473b8429128869f77d4b2fbbe741d067 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 19 Aug 2024 08:41:10 +0300
Subject: viewer#2311 When email or profile image upload fails show a more
 fitting reason

---
 indra/newview/skins/default/xui/en/notifications.xml | 20 ++++++++++++++++++++
 1 file changed, 20 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 91b137b75f..e539388735 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2388,6 +2388,26 @@ Unable to upload [FILE] due to the following reason: [REASON]
 Please try again later.
   <tag>fail</tag>
   </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="CannotUploadSnapshotEmailTooBig"
+   type="alertmodal">
+Unable to upload snapshot [FILE] due to the following reason: [REASON]
+
+File might be too big, try reducing resolution, quality or try again later.
+  <tag>fail</tag>
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="CannotUploadSnapshotWebTooBig"
+   type="alertmodal">
+Unable to upload snapshot.
+
+File might be too big, try reducing resolution or try again later.
+  <tag>fail</tag>
+  </notification>
 
   <notification
    icon="notifytip.tga"
-- 
cgit v1.2.3


From 169599fd2f211d66f80a54e13daf975229607022 Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <Ansariel@users.noreply.github.com>
Date: Mon, 19 Aug 2024 23:48:07 +0200
Subject: Fix a bunch of XUI errors (#2347)

* Fix a bunch of XUI errors

* Change TRUE to true
---
 indra/newview/skins/default/xui/en/floater_fast_timers.xml      | 2 ++
 indra/newview/skins/default/xui/en/panel_login.xml              | 1 -
 indra/newview/skins/default/xui/en/panel_preferences_colors.xml | 1 -
 indra/newview/skins/default/xui/en/widgets/slider_bar.xml       | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index f5852fdfaf..00411ba20b 100644
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -73,7 +73,9 @@
         name="scroll_vert"
         orientation="vertical"
         step_size="16"
+        doc_pos="0"
         doc_size="3000"
+        page_size="0"
           />
     </layout_panel>
     <layout_panel name="timers_panel"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 1801ae1f49..27b74a46ce 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -145,7 +145,6 @@
     control_name="RememberPassword"
     follows="left|top"
     font="SansSerifMedium"
-    text_color="EmphasisColor"
     height="24"
     left="408"
     bottom_delta="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 5d93846ce5..44df5354aa 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -313,7 +313,6 @@
   <color_swatch
    can_apply_immediately="true"
    color="0 0 0 1"
-   control_name="NameTagBackground"
    follows="left|top"
    height="24"
    label_height="0"
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 1cfe3d68f9..8c52f06c45 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--All horizontal sliders are configured to have no highlighted track. See EXT-5939. -->
 <slider_bar follows="left|top"
-            track_color="SliderTrackColor"
             thumb_outline_color="SliderThumbOutlineColor"
             thumb_center_color="SliderThumbCenterColor"
             thumb_image="SliderThumb_Off"
-- 
cgit v1.2.3


From 11afd7f86afd19fde8b577f57736d6d27542484e Mon Sep 17 00:00:00 2001
From: Brad Linden <46733234+brad-linden@users.noreply.github.com>
Date: Thu, 29 Aug 2024 12:57:49 -0700
Subject: Add error handling for intel crashes from GLTF Scene shader (#2456)

fix secondlife/viewer#1856
---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 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 e539388735..5ce73b2cfa 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12572,4 +12572,15 @@ are wearing now.
       yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="NoSupportGLTFShader"
+   type="notify">
+     GLTF scenes are not yet supported on your graphics hardware.
+     <tag>fail</tag>
+     <usetemplate
+       name="okbutton"
+       yestext="OK"/>
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3