livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19 from secondlife/SL-18746 

SL-18746: Fix misplaced control in build menu
meow-7.2.2
cosmic-linden 2022-12-01 09:06:47 -08:00 committed by GitHub
parent b095194267 51d5748d64
commit 9e8f15bc4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpanelface.cpp
View File

@ -1064,7 +1064,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
F32 transparency = (1.f - color.mV[VALPHA]) * 100.f;
getChild<LLUICtrl>("ColorTrans")->setValue(editable ? transparency : 0);
getChildView("ColorTrans")->setEnabled(editable);
getChildView("ColorTrans")->setEnabled(editable && has_material);
// Specular map
LLSelectedTEMaterial::getSpecularID(specmap_id, identical_spec);

70
indra/newview/skins/default/xui/en/panel_tools_texture.xml
View File

@ -891,6 +891,40 @@
max_val="1"
name="shinyOffsetV"
width="265" />
<check_box
follows="top|left"
height="16"
initial_value="false"
label="Align planar faces"
layout="topleft"
left="7"
name="checkbox planar align"
tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
top_delta="20"
width="260" />
<button
follows="left|top"
layout="topleft"
left="9"
top="231"
height="20"
label="Align"
label_selected="Align current texture layers"
name="button align textures"
tool_tip="Align current texture layers"
width="66" />
<web_browser
visible="false"
enabled="false"
border_visible="true"
bottom_delta="0"
follows="top|left"
left="0"
name="title_media"
width="4"
height="4"
start_url="about:blank"
decouple_texture_size="true" />
<!-- BEGIN PBR Material texture transform parameters -->
<spinner
follows="left|top"
@ -903,7 +937,7 @@
min_val="-100"
max_val="100"
name="gltfTextureScaleU"
top_delta="-115"
top_delta="34"
width="265" />
<spinner
follows="left|top"
@ -954,38 +988,4 @@
name="gltfTextureOffsetV"
width="265" />
<!-- END PBR Material texture transform parameters -->
<check_box
follows="top|left"
height="16"
initial_value="false"
label="Align planar faces"
layout="topleft"
left="7"
name="checkbox planar align"
tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
top_delta="43"
width="260" />
<button
follows="left|top"
layout="topleft"
left="9"
top="231"
height="20"
label="Align"
label_selected="Align current texture layers"
name="button align textures"
tool_tip="Align current texture layers"
width="66" />
<web_browser
visible="false"
enabled="false"
border_visible="true"
bottom_delta="0"
follows="top|left"
left="0"
name="title_media"
width="4"
height="4"
start_url="about:blank"
decouple_texture_size="true" />
</panel>