diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-30 18:26:40 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-30 18:26:40 -0700 |
| commit | 171e1f314b641c6d328ad5986e285e7e8f3951f4 (patch) | |
| tree | feb51ad50850735b48f6672f7549bada46fd1169 /indra | |
| parent | 32e352ece9e3cc2e20044f621338ec07a2484773 (diff) | |
PATH-456: Disabling the Flexible Path checkbox on permanent objects in the frozen state.
Diffstat (limited to 'indra')
| -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 58c38387c3..557daeaec2 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 && !volobjp->isMesh()); + getChildView("Flexible1D Checkbox Ctrl")->setEnabled(editable && single_volume && volobjp && !volobjp->isMesh() && !objectp->isPermanentEnforced()); } else { |