From e42297fb1982a26ce23df14193e314aaa5a431b4 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 13 Mar 2024 16:11:49 -0700
Subject: secondlife/viewer#76: Change wording of terrain blending
 documentation when using materials

---
 indra/newview/llfloaterregioninfo.cpp              | 13 ++++++++
 .../skins/default/xui/en/panel_region_terrain.xml  | 37 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 454842999d..6ad776643d 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -1479,6 +1479,19 @@ void LLPanelRegionTerrainInfo::updateForMaterialType()
 	if (texture_label) { texture_label->setVisible(show_texture_controls); }
     LLUICtrl* material_label = findChild<LLUICtrl>("detail_material_text");
 	if (material_label) { material_label->setVisible(show_material_controls); }
+
+    // Toggle visibility of documentation labels for terrain blending ranges
+    const std::vector<std::string> doc_suffixes { "5", "10", "11" };
+    std::string buffer;
+    for (const std::string& suffix : doc_suffixes)
+    {
+        buffer = "height_text_lbl" + suffix;
+        LLUICtrl* texture_doc_label = findChild<LLUICtrl>(buffer);
+        if (texture_doc_label) { texture_doc_label->setVisible(show_texture_controls); }
+        buffer += "_material";
+        LLUICtrl* material_doc_label = findChild<LLUICtrl>(buffer);
+        if (material_doc_label) { material_doc_label->setVisible(show_material_controls); }
+    }
 }
 
 // virtual
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 f8d2c90d0a..38d885d72d 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -257,6 +257,19 @@
      width="300">
         Texture Elevation Ranges
     </text>
+    <text
+     visible="false"
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl5_material"
+     top_delta="0"
+     width="300">
+        Material Elevation Ranges
+    </text>
     <text
      follows="left|top"
      height="20"
@@ -268,6 +281,18 @@
      word_wrap="true">
       These values represent the blend range for the textures above.
     </text>
+    <text
+     visible="false"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl10_material"
+     top_delta="0"
+     width="200"
+     word_wrap="true">
+      These values represent the blend range for the materials above.
+    </text>
     <text
        follows="left|top"
        height="60"
@@ -279,6 +304,18 @@
        word_wrap="true">
         Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
     </text>
+    <text
+       visible="false"
+       follows="left|top"
+       height="60"
+       layout="topleft"
+       left_delta="0"
+       name="height_text_lbl11_material"
+       top_delta="0"
+       width="200"
+       word_wrap="true">
+        Measured in meters, the LOW value is the MAXIMUM height of Material #1, and the HIGH value is the MINIMUM height of Material #4.
+    </text>
     <text
      follows="left|top"
      height="20"
-- 
cgit v1.2.3