diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-29 07:36:55 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-29 07:36:55 -0700 |
| commit | 2f5c6456991881ca5a80f021d6d4c94739d16565 (patch) | |
| tree | c24f45d25050ea499f41cdac46a06c8539349909 /indra/newview/llpaneleditwearable.cpp | |
| parent | b54fd9d6855c8547ce03beacf1ef04eb6396e75e (diff) | |
| parent | 4a3710501b1aeae90afbd48c7e3531c86f92517e (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llpaneleditwearable.cpp')
| -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) |