diff options
| author | seth_productengine <none@none> | 2011-08-08 15:43:00 +0300 |
|---|---|---|
| committer | seth_productengine <none@none> | 2011-08-08 15:43:00 +0300 |
| commit | df353a6746f6261ac238d29a418962bbab62ec5b (patch) | |
| tree | 113a11702c5de5fa0e9097f3129927b249aa2781 /indra/newview/llpanelvolume.cpp | |
| parent | ef6e51db22ad3aec42b19bcf3e077ff000ba8929 (diff) | |
| parent | 575c7f85b20fca57fcd97a2a18bd7ad0c030a935 (diff) | |
Merge with 8582496d7733948e19396167df9b4d2d4cd35f0c
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 2 |
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 { |