diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
| commit | d8f795aa9ceaae73ad8890a1110fa6b4045843c7 (patch) | |
| tree | 96bd0bbc9d7bbe2a6a8d9a543fc581d82fdc1965 /indra/newview/llpaneleditwearable.cpp | |
| parent | 9ae6672a15ae64dba1d2af774dcde26700fb6126 (diff) | |
| parent | 467a8b0441e139773775ecf306f430f44814bff5 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llpaneleditwearable.cpp')
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 26f0b3f48f..14f05bdb17 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -963,8 +963,7 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type) for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(update_color_swatch_ctrl, this, _1, _2)); for_each_picker_ctrl_entry <LLTextureCtrl> (panel, type, boost::bind(update_texture_ctrl, this, _1, _2)); } - - if (!is_modifiable || !is_copyable) + else { // Disable controls for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(set_enabled_color_swatch_ctrl, false, _1, _2)); |