livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge viewer-bear

master
Ansariel 2017-02-03 20:14:11 +01:00
parent e8d4094d90 fd81f83f6b
commit 366b684300
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
indra/newview/llappearancemgr.cpp
View File

@ -1289,31 +1289,32 @@ void LLWearableHoldingPattern::onWearableAssetFetch(LLViewerWearable *wearable)
data.mWearable = wearable;
use_count++;
}
else if (wearable->getPermissions().allowModifyBy(gAgent.getID()))
{
// We can't edit and do some other interactions with same asset twice, copy it
LLViewerWearable* new_wearable = LLWearableList::instance().createCopy(wearable, wearable->getName());
data.mWearable = new_wearable;
data.mAssetID = new_wearable->getAssetID();
LLViewerInventoryItem* item = gInventory.getItem(data.mItemID);
if (item)
{
// Update existing inventory item
item->setAssetUUID(new_wearable->getAssetID());
item->setTransactionID(new_wearable->getTransactionID());
gInventory.updateItem(item, LLInventoryObserver::INTERNAL);
item->updateServer(FALSE);
}
use_count++;
}
else
{
// Note: technically a bug, LLViewerWearable can identify only one item id at a time,
// yet we are tying it to multiple items here.
// LLViewerWearable need to support more then one item.
LL_WARNS() << "Same LLViewerWearable is used by multiple items! " << wearable->getAssetID() << LL_ENDL;
data.mWearable = wearable;
LLViewerInventoryItem* wearable_item = gInventory.getItem(data.mItemID);
if (wearable_item && wearable_item->getPermissions().allowModifyBy(gAgentID))
{
// We can't edit and do some other interactions with same asset twice, copy it
LLViewerWearable* new_wearable = LLWearableList::instance().createCopy(wearable, wearable->getName());
data.mWearable = new_wearable;
data.mAssetID = new_wearable->getAssetID();
// Update existing inventory item
wearable_item->setAssetUUID(new_wearable->getAssetID());
wearable_item->setTransactionID(new_wearable->getTransactionID());
gInventory.updateItem(wearable_item, LLInventoryObserver::INTERNAL);
wearable_item->updateServer(FALSE);
use_count++;
}
else
{
// Note: technically a bug, LLViewerWearable can identify only one item id at a time,
// yet we are tying it to multiple items here.
// LLViewerWearable need to support more then one item.
LL_WARNS() << "Same LLViewerWearable is used by multiple items! " << wearable->getAssetID() << LL_ENDL;
data.mWearable = wearable;
}
}
}
}