diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-07 16:33:44 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-07 16:33:44 -0400 |
| commit | dbe288bf8f14447f7bda5413c7886f539fec2a20 (patch) | |
| tree | 258ae967553d14650d881c56ba8610b3bb5345f1 /indra | |
| parent | 52293aa4bb7af45d2c3733f20982f4acb030c2d8 (diff) | |
fixes from automated merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index dc039486e1..c3def73753 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -376,14 +376,14 @@ void LLPanelOutfitEdit::onEditWearableClicked(void) if(wearable_to_edit) { bool can_modify = false; - bool is_complete = item_to_edit->isComplete(); + bool is_complete = item_to_edit->isFinished(); // if item_to_edit is a link, its properties are not appropriate, // lets get original item with actual properties LLViewerInventoryItem* original_item = gInventory.getItem(wearable_to_edit->getItemID()); if(original_item) { can_modify = original_item->getPermissions().allowModifyBy(gAgentID); - is_complete = original_item->isComplete(); + is_complete = original_item->isFinished(); } if (can_modify && is_complete) |