From 94c5baeb6146598a9a280e27e584c241b7b3b9e0 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 1 Mar 2024 17:26:24 -0800
Subject: secondlife/viewer#712: Use checkbox to make it more obvious that only
 one set of terrain assets is preserved. Clean up enums.

---
 .../skins/default/xui/en/panel_region_terrain.xml  | 45 ++++++++++------------
 1 file changed, 21 insertions(+), 24 deletions(-)

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

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 88855ab739..f8d2c90d0a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -76,33 +76,17 @@
      left="8"
      top="30"
      width="460" />
-    <combo_box
-     layout="topleft"
-     left="10"
-     top="105"
-     follows="left|top"
-     name="terrain_material_type"
-     width="170">
-        <combo_box.item
-         label="Terrain Textures"
-         name="Textures"
-         value="Textures" />
-        <combo_box.item
-         label="Terrain PBR Materials"
-         name="PBRMaterials"
-         value="PBRMaterials" />
-    </combo_box>
     <text
      type="string"
      length="1"
-     follows="left|top"
      halign="left"
      valign="center"
+     follows="left|top"
      height="20"
      layout="topleft"
      name="detail_texture_text"
-     top_delta="0"
-     left_delta="0"
+     left="10"
+     top="105"
      width="170">
         Terrain Textures
     </text>
@@ -114,12 +98,25 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     top_delta="0"
-     left_delta="180"
-     name="detail_texture_limits_text"
-     width="200">
-        Maximum size: 1024x1024
+     name="detail_material_text"
+     left="10"
+     top="105"
+     width="170">
+        Terrain Materials
     </text>
+    <check_box
+     height="20"
+     halign="left"
+     valign="center"
+     follows="left|top"
+     layout="topleft"
+     top_delta="1"
+     left_delta="180"
+     label="PBR Metallic Roughness"
+     name="terrain_material_type"
+     tool_tip="If checked, use PBR Metallic Roughness materials for terrain. Otherwise, use textures."
+     left_pad="2"
+     width="200" />
     <texture_picker
      follows="left|top"
      height="100"
-- 
cgit v1.2.3