diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-28 10:21:57 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-28 10:21:57 -0700 |
| commit | adc29e9b9f4d88cd6adfd27b3b516c069f84693c (patch) | |
| tree | 8da93a93314cd06eb4a5eeab1fcabe84301b5abd /indra | |
| parent | daabe1fb133d69df938bb58d12f0be26bdc16ead (diff) | |
EXT-8030 Can't edit worn Tattoos - Texture and Color pickers won't open
EXT-8029 Edit Wearable > Skirt, Jacket, Socks - Can't open texture or color picker, texture appears as gray X
EXT-7770 Revert on shirt edit doesn't revert the fabric or color/tint icons back to their originals
fixes color swatch/texture ctrl disabled issue and "undo changes" not reverting textures on avatar
does not fix grey tattoo preview issue
reviewed by Nyx
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 0ff3bb30dc..323a07a9ab 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -948,7 +948,6 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type) return; bool is_modifiable = false; - bool is_complete = false; bool is_copyable = false; if(mWearableItem) @@ -956,17 +955,16 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type) const LLPermissions& perm = mWearableItem->getPermissions(); is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID()); is_copyable = perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID()); - is_complete = mWearableItem->isFinished(); } - if (is_modifiable && is_complete) + if (is_modifiable) { // Update picker controls 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_complete || !is_copyable) + if (!is_modifiable || !is_copyable) { // Disable controls for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(set_enabled_color_swatch_ctrl, false, _1, _2)); @@ -1007,6 +1005,7 @@ void LLPanelEditWearable::revertChanges() mWearablePtr->revertValues(); mNameEditor->setText(mWearablePtr->getName()); updatePanelPickerControls(mWearablePtr->getType()); + gAgentAvatarp->wearableUpdated(mWearablePtr->getType(), FALSE); } void LLPanelEditWearable::showWearable(LLWearable* wearable, BOOL show) |