From 5d918f98eaacc0eec84edcf23a40d6f6c93807c3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Sep 2022 00:01:03 +0300
Subject: SL-18161 Add PBR materials to Uploads in preferences

---
 .../default/xui/en/panel_preferences_uploads.xml   | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_uploads.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
index 67eff2b762..08ff3d4d53 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
@@ -122,6 +122,31 @@
    width="370"
    word_wrap="true"/>
 
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   left="37"
+   name="title_pbr"
+   top_pad="7"
+   width="100">
+    PBR Materials
+  </text>
+  <text
+   type="string"
+   use_ellipses="true"
+   follows="left|top"
+   height="27"
+   layout="topleft"
+   font.style="BOLD"
+   left="37"
+   name="upload_pbr"
+   top_pad="5"
+   width="370"
+   word_wrap="true"/>
+
   <text
    type="string"
    length="1"
-- 
cgit v1.2.3


From 06c2c87bfaf364cb358b8a4b194e6369531a63c6 Mon Sep 17 00:00:00 2001
From: Yuzuru Jewell <46077079+YuzuruJewell@users.noreply.github.com>
Date: Fri, 24 Nov 2023 20:06:23 +0900
Subject: Suggestions for fixing problems in xui/en XML files (#534)

Co-authored-by: Yuzuru Kato <pascal.imac@gmail.com>
Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
---
 indra/newview/skins/default/xui/en/panel_preferences_uploads.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_uploads.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
index 67eff2b762..90b0c19cc4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="all"
-- 
cgit v1.2.3