diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-03-06 13:46:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-06 13:46:16 -0800 |
| commit | 4195e355933fdba9c34040688e837e856763b81a (patch) | |
| tree | a3894b2beaf4d4bb265d502f32a2a196bb07d9fc /indra/newview/skins/default/xui | |
| parent | 89b48796271f48c8b89e7981095bed4acf825a0f (diff) | |
| parent | 0cf4141d7dddfcaf5399bc99306a7426b561953c (diff) | |
Merge pull request #927 from secondlife/v-712
PBR Terrain UI second pass
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_terrain.xml | 45 |
1 files changed, 21 insertions, 24 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 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" |