summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-07-25 21:23:01 -0500
committerDave Parks <davep@lindenlab.com>2011-07-25 21:23:01 -0500
commitf79a058f3ce50361b732061ab30f4a1923fba445 (patch)
tree143904ad96d13c568840865704812b51f81210d1
parent51ccb58d31592c9530ad67b49d1aacd9644ff19e (diff)
SH-1874 Make UI reflect that a mesh cannot be made flexible.
-rw-r--r--indra/newview/llpanelvolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index bb87601d20..12eea7844d 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -351,7 +351,7 @@ void LLPanelVolume::getState( )
getChild<LLUICtrl>("Flexible1D Checkbox Ctrl")->setValue(is_flexible);
if (is_flexible || (volobjp && volobjp->canBeFlexible()))
{
- getChildView("Flexible1D Checkbox Ctrl")->setEnabled(editable && single_volume && volobjp);
+ getChildView("Flexible1D Checkbox Ctrl")->setEnabled(editable && single_volume && volobjp && !volobjp->isMesh());
}
else
{