diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-26 13:08:13 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-26 13:08:13 -0400 |
| commit | 1ead58914837f12e943ff1db4b71cd3ed379d01c (patch) | |
| tree | dbb6678b4b519e543deb3c344174888b99b4ccd7 /indra/newview/llpanelvolume.cpp | |
| parent | 5b7b3cbbbbec439880a33af8944d10c7bb527c3a (diff) | |
| parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
Merge
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 { |