summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-08-30 14:42:04 -0500
committerDave Parks <davep@lindenlab.com>2022-08-30 14:42:04 -0500
commit03d012d46cbcc6d67f6241ce66649e92688f246f (patch)
tree783c6589011954539ae4ea4d2592cfdf8dc5f35f /indra/newview
parente928e3fec4cd2b370421e592a1f01bb3874de67b (diff)
SL-18038 Remove placeholder "save as material" button
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelface.cpp5
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml25
2 files changed, 0 insertions, 30 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index ec67a9cdc6..865529eb8f 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -178,7 +178,6 @@ BOOL LLPanelFace::postBuild()
childSetAction("button align",&LLPanelFace::onClickAutoFix,this);
childSetAction("button align textures", &LLPanelFace::onAlignTexture, this);
- childSetAction("button save material", &LLPanelFace::onSaveMaterial, this);
LLTextureCtrl* mTextureCtrl;
LLTextureCtrl* mShinyTextureCtrl;
@@ -1444,12 +1443,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
// enable this UI box if a single face is selected.
BOOL is_single_face = !LLSelectMgr::getInstance()->getSelection()->isMultipleTESelected();
- childSetEnabled("button save material", static_cast<bool>(is_single_face));
childSetEnabled("materialID", static_cast<bool>(is_single_face)); // doesn't work - why?
- // TODO: 2022-04 conflicts with media button placement. hide the button if applying media
- // i.e. childSetVisible("button save material", !applying_media);
-
if (material && editable)
{
LL_DEBUGS("Materials") << material->asLLSD() << LL_ENDL;
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 326fb27915..2af7ccaa7a 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -845,29 +845,4 @@
height="4"
start_url="about:blank"
decouple_texture_size="true" />
- <button
- left="90"
- top="227"
- height="20"
- label="Save as Material"
- label_selected="Save current face as a Material"
- layout="topleft"
- name="button save material"
- top_delta="0"
- tool_tip="Save material to inventory"
- width="110" />
-
- <line_editor
- enabled="true"
- follows="top|left"
- height="16"
- layout="topleft"
- left="7"
- label="Material UUID"
- name="materialID"
- select_on_focus="true"
- top="405"
- width="200"
- tool_tip="UUID for a material asset"
- />
</panel>