diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-08 08:03:44 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-08 08:03:44 -0700 |
| commit | 0a2fc3e4b93c13854a1776456ebed7f53ceb67e8 (patch) | |
| tree | 81fd1a3b3ce43f29a1f5d6e0925b288eeff2b090 /indra/newview/llpaneleditwearable.cpp | |
| parent | 8cda9a026691690fd7e4bb0013cbccc287ef96d5 (diff) | |
| parent | ca5e05a5c763b8eba3c6441f0f931af27cc89542 (diff) | |
Merged from viewer-release
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)); |