diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2024-03-15 16:43:20 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2024-03-15 16:43:20 -0700 |
| commit | 7ae7f9554d794abc62d6162043d41ea2aada9316 (patch) | |
| tree | f83ab2cb105dad86bcfb557d830f55a87944ee79 | |
| parent | faa0f3696465a1e3ab80a277d0aad09c0775e450 (diff) | |
secondlife/viewer#1006: Prevent PBR terrain material swatches from being null. Default to blank material for now.
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_terrain.xml | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 084ff98851..8c4b6fc857 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -62,6 +62,7 @@ #include "llfloaterreg.h" #include "llfloaterregiondebugconsole.h" #include "llfloatertelehub.h" +#include "llgltfmateriallist.h" #include "llinventorymodel.h" #include "lllineeditor.h" #include "llnamelistctrl.h" @@ -1394,7 +1395,7 @@ LLPanelRegionTerrainInfo::LLPanelRegionTerrainInfo() } for (S32 i = 0; i < LLTerrainMaterials::ASSET_COUNT; ++i) { - mLastSetMaterials[i] = LLUUID::null; + mLastSetMaterials[i] = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID; } } 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 |