diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2022-12-01 09:06:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-01 09:06:47 -0800 |
| commit | 9e8f15bc4b153264c9691912cea1effdbaad3da5 (patch) | |
| tree | 15419d952e79fbd825640543495f2c373d7fea70 /indra | |
| parent | b095194267389b0f5512fb14f18338bd256f3e81 (diff) | |
| parent | 51d5748d64cf90896f2c4945e8d13dd98a9be65b (diff) | |
Merge pull request #19 from secondlife/SL-18746
SL-18746: Fix misplaced control in build menu
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 70 |
2 files changed, 36 insertions, 36 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 3d72865f69..2b1862304a 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -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); diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index ba5a20dd22..3bcbe0ca3a 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -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> |