summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorcosmic-linden <111533034+cosmic-linden@users.noreply.github.com>2024-03-18 13:36:36 -0700
committerGitHub <noreply@github.com>2024-03-18 13:36:36 -0700
commit2a325fdebadd32a230f10b372b25ec5474e50f63 (patch)
tree7c6b0ecfe3609c213d9e73d59ba2bb74d71696f3 /indra/newview/skins/default/xui
parente2af6de213ff57439e008487229723d004239425 (diff)
parent3caf96b9ad10bb3c6afe5b067697809ecee51e90 (diff)
Merge pull request #1013 from secondlife/v-1006
secondlife/viewer#1006: Prevent setting PBR terrain material swatches to null
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_terrain.xml8
1 files changed, 4 insertions, 4 deletions
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 38d885d72d..4a2c0d42b9 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -161,7 +161,7 @@
left="10"
name="material_detail_0"
pick_type="material"
- allow_no_texture="true"
+ default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
top_delta="0"
width="100" />
<texture_picker
@@ -172,7 +172,7 @@
left_pad="10"
name="material_detail_1"
pick_type="material"
- allow_no_texture="true"
+ default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
top_delta="0"
width="100" />
<texture_picker
@@ -183,7 +183,7 @@
left_pad="10"
name="material_detail_2"
pick_type="material"
- allow_no_texture="true"
+ default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
top_delta="0"
width="100" />
<texture_picker
@@ -194,7 +194,7 @@
left_pad="10"
name="material_detail_3"
pick_type="material"
- allow_no_texture="true"
+ default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
top_delta="0"
width="100" />
<text