From eb0d98850b5de362c7c9bbe405541a23f1b2729a Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 3 May 2025 15:32:53 +0200
Subject: [PATCH 1/2] Fix classic texture panel layout

---
 .../newview/skins/default/xui/de/panel_tools_texture.xml  | 8 +++++---
 .../newview/skins/default/xui/en/panel_tools_texture.xml  | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/panel_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
index b89e45574c..e473cb9322 100644
--- a/indra/newview/skins/default/xui/de/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
@@ -29,7 +29,7 @@
 		Leuchten
 	</text>
 	<check_box label="Ganz hell" name="checkbox fullbright"/>
-	<check_box label="Wasser verstecken" name="checkbox_hide_water" left="135"/>
+	<check_box label="Wasser verst." name="checkbox_hide_water"/>
 	<button name="copy_face_btn" tool_tip="Textur-Parameter in Zwischenablage kopieren"/>
 	<button name="paste_face_btn" tool_tip="Textur-Parameter aus Zwischenablage einfügen"/>
 	<menu_button name="paste_face_gear_btn" tool_tip="Einfüge-Optionen"/>
@@ -47,9 +47,11 @@
 		<radio_item label="Glanz (specular)" name="Shininess (specular)"/>
 	</radio_group>
 	<radio_group name="radio_pbr_type">
-		<radio_item label="Farbe/ausstrahlend" name="Color/emissive"/>
-		<radio_item label="Normal" name="Normal"/>
+		<radio_item label="Komplettes Material" name="Complete material"/>
+		<radio_item label="Basis-Farbe" name="Base color"/>
 		<radio_item label="Metallisch/Unenbenheit" name="Metallic/roughness"/>
+		<radio_item label="Ausstrahlend" name="Emissive"/>
+		<radio_item label="Normal" name="Normal"/>
 	</radio_group>
 	<texture_picker label="Material" name="pbr_control" tool_tip="Klicken, um ein PBR-Material zu wählen"/>
 	<!-- <button name="pbr_from_inventory" label="Aus Inventory wählen"/> -->
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 48235e50ee..0751c68216 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -110,12 +110,12 @@
              top_pad="4"
              width="81" />
             <check_box
-             height="19"
+             height="17"
              label="Hide water"
              layout="topleft"
-             left="172"
+             left="7"
              name="checkbox_hide_water"
-             top_delta="0"
+             top_pad="0"
              width="81" />
             <button
              follows="top|right"
@@ -144,6 +144,7 @@
              top_pad="5"
              width="25">
             </button>
+            <!-- FS:Ansariel: Removed to make enough room
             <text
              type="string"
              length="1"
@@ -156,6 +157,7 @@
              width="90">
                 Material
             </text>
+            -->
             <combo_box
              height="23"
              layout="topleft"

From 5927fba8c0a7a89fd072a80954486d13b5db2960 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 3 May 2025 15:40:29 +0200
Subject: [PATCH 2/2] Set PBR material precision for classic texture panel

---
 indra/newview/llpanelface.cpp                          |  5 +++++
 .../skins/default/xui/en/panel_tools_texture.xml       | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 60e484c44b..2a8c3fd059 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -5542,6 +5542,11 @@ void LLPanelFace::changePrecision(S32 decimal_precision)
     mBumpyRotate->setPrecision(decimal_precision);
     mShinyRotate->setPrecision(decimal_precision);
     mTexRepeat->setPrecision(decimal_precision);
+    mPBRScaleU->setPrecision(decimal_precision);
+    mPBRScaleV->setPrecision(decimal_precision);
+    mPBRRotate->setPrecision(decimal_precision);
+    mPBROffsetU->setPrecision(decimal_precision);
+    mPBROffsetV->setPrecision(decimal_precision);
 }
 // </FS:CR>
 
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 0751c68216..a4c5578776 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -975,7 +975,7 @@
              height="19"
              initial_value="1"
              label="Scale u"
-             label_width="205"
+             label_width="195"
              layout="topleft"
              left="10"
              min_val="-100"
@@ -988,7 +988,7 @@
              height="19"
              initial_value="1"
              label="Scale v"
-             label_width="205"
+             label_width="195"
              layout="topleft"
              left="10"
              min_val="-100"
@@ -1000,7 +1000,7 @@
              height="19"
              initial_value="0"
              label="Rotation"
-             label_width="205"
+             label_width="195"
              layout="topleft"
              left="10"
              min_val="-360"
@@ -1013,7 +1013,7 @@
              height="19"
              initial_value="0"
              label="Offset u"
-             label_width="205"
+             label_width="195"
              layout="topleft"
              left="10"
              min_val="-999"
@@ -1025,7 +1025,7 @@
              height="19"
              initial_value="0"
              label="Offset v"
-             label_width="205"
+             label_width="195"
              layout="topleft"
              left="10"
              min_val="-999"