From a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 4 Mar 2008 16:59:57 +0000 Subject: svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge QAR-343 - merge maint-ui-7 and maint-ui-8 to release --- indra/newview/llpanelobject.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelobject.cpp') diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 2ebbc07500..f0acbf4b22 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1055,10 +1055,9 @@ void LLPanelObject::getState( ) mLabelRevolutions->setVisible( revolutions_visible ); mSpinRevolutions ->setVisible( revolutions_visible ); - bool sculpt_type_visible = FALSE; // currently not visible - for LSL setting only mCtrlSculptTexture->setVisible(sculpt_texture_visible); - mLabelSculptType->setVisible(sculpt_texture_visible && sculpt_type_visible); - mCtrlSculptType->setVisible(sculpt_texture_visible && sculpt_type_visible); + mLabelSculptType->setVisible(sculpt_texture_visible); + mCtrlSculptType->setVisible(sculpt_texture_visible); // sculpt texture -- cgit v1.2.3