diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-08 10:14:00 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-08 10:14:00 +0100 |
| commit | ca5e05a5c763b8eba3c6441f0f931af27cc89542 (patch) | |
| tree | db0e22ff1e82f81edb822ee454b0fb130cf8ee3d /indra/newview/llpaneleditwearable.cpp | |
| parent | b9248bddec805a388772adb38ee707f1307861a6 (diff) | |
| parent | 27b3005b788b969005f8b942024aacd29d16a674 (diff) | |
merge from PE's viewer-public
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)); |