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

Merge LL Viewer release 5.0.2

meow-7.2.2
Ansariel 2017-03-06 21:35:23 +01:00
parent bbbb8765fc 08ed7f676f
commit 80f2d2f827
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -559,3 +559,4 @@ b280a1c797a3891e68dbc237e73de9cf19f426e9 4.1.1-release
bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release
b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release
c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release
cea1632c002c065985ebea15eeeb4aac90f50545 5.0.2-release

2
indra/newview/VIEWER_VERSION.txt
View File

@ -1 +1 @@
5.0.2
5.0.3

4
indra/newview/llappearancemgr.cpp
View File

@ -1292,9 +1292,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();