diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-08 10:57:15 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-08 10:57:15 -0400 |
| commit | c80da2248d17bf9355fccd203b51548f983bd8ab (patch) | |
| tree | 17a2977b1c68013b0855f098aa4cdbd72950eb57 /indra/newview/llpaneleditwearable.cpp | |
| parent | 7380d8f1cb9a40d1ca50d2c7675e08d270928947 (diff) | |
| parent | ca5e05a5c763b8eba3c6441f0f931af27cc89542 (diff) | |
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)); |