From 9ddb1cde5778fa5be92c0130a72fb6f7d0c2d4d4 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 24 Dec 2023 20:15:51 -0500
Subject: [PATCH] Fix incorrectly showing sculpt texture control when selecting
mesh
---
indra/newview/llpanelobject.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 9a631da5048..9ae82f94308 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1250,11 +1250,6 @@ void LLPanelObject::getState( )
mLabelRevolutions->setVisible( revolutions_visible );
mSpinRevolutions ->setVisible( revolutions_visible );
- mCtrlSculptTexture->setVisible(sculpt_texture_visible);
- mLabelSculptType->setVisible(sculpt_texture_visible);
- mCtrlSculptType->setVisible(sculpt_texture_visible);
-
-
// sculpt texture
if (selected_item == MI_SCULPT)
{
@@ -1314,12 +1309,12 @@ void LLPanelObject::getState( )
if (mCtrlSculptInvert)
{
mCtrlSculptInvert->set(sculpt_invert);
- mCtrlSculptInvert->setEnabled(editable);
+ mCtrlSculptInvert->setEnabled(editable && !isMesh);
}
if (mLabelSculptType)
{
- mLabelSculptType->setEnabled(TRUE);
+ mLabelSculptType->setEnabled(TRUE && !isMesh);
}
}
@@ -1329,6 +1324,9 @@ void LLPanelObject::getState( )
mSculptTextureRevert = LLUUID::null;
}
+ mCtrlSculptTexture->setVisible(sculpt_texture_visible && !isMesh);
+ mLabelSculptType->setVisible(sculpt_texture_visible && !isMesh);
+ mCtrlSculptType->setVisible(sculpt_texture_visible && !isMesh);
mCtrlSculptMirror->setVisible(sculpt_texture_visible && !isMesh);
mCtrlSculptInvert->setVisible(sculpt_texture_visible && !isMesh);
--
GitLab