diff options
| author | prep <prep@lindenlab.com> | 2011-07-28 16:09:41 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-07-28 16:09:41 -0400 |
| commit | 762143377a5c62bf79dabe158c72658a33873a2a (patch) | |
| tree | ffbab6e8a5b1dc540ef0a6d62b72df38a3a003a4 /indra/newview/llpanelvolume.cpp | |
| parent | 7fc12cd43dcb21df88be5c47c319d0d3f6498216 (diff) | |
| parent | 715d9f20a7b64f5b9f52b4c363f32078f7f5e2fd (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 { |