diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-03-01 22:59:48 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-03-01 22:59:48 +0200 |
| commit | 9d9ff51b63d51e4d3e93393e957420e7027ea46e (patch) | |
| tree | b28e7b492cbc70b24f1002e2c85d56c7e643b568 /indra/newview | |
| parent | b4c4a951c161e43bf66141248f0c94b97848ae98 (diff) | |
| parent | 535f5c51202085ed5ad88ad1949fd7bcb0dc5174 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 35d08c7ab1..feb981217d 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1249,9 +1249,11 @@ void LLWearableHoldingPattern::onWearableAssetFetch(LLViewerWearable *wearable) else { LLViewerInventoryItem* wearable_item = gInventory.getItem(data.mItemID); - if (wearable_item && wearable_item->getPermissions().allowModifyBy(gAgentID)) + if (wearable_item && wearable_item->isFinished() && wearable_item->getPermissions().allowModifyBy(gAgentID)) { // We can't edit and do some other interactions with same asset twice, copy it + // Note: can't update incomplete items. Usually attached from previous viewer build, but + // consider adding fetch and completion callback LLViewerWearable* new_wearable = LLWearableList::instance().createCopy(wearable, wearable->getName()); data.mWearable = new_wearable; data.mAssetID = new_wearable->getAssetID(); |