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

FIRE-20311: Editing landmarks breaks the landmark

meow-7.2.2
Ansariel 2016-11-04 12:43:16 +01:00
parent f13e5890d9
commit 2b18e2158f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llviewerinventory.cpp
View File

@ -1441,12 +1441,24 @@ void update_inventory_item(
if (updates.has("asset_id"))
{
updates.erase("asset_id");
updates["hash_id"] = update_item->getTransactionID();
// <FS:Ansariel> Check for non-null UUID as in LLViewerInventoryItem::updateServer
//updates["hash_id"] = update_item->getTransactionID();
if(update_item->getTransactionID().notNull())
{
updates["hash_id"] = update_item->getTransactionID();
}
// </FS:Ansariel>
}
if (updates.has("shadow_id"))
{
updates.erase("shadow_id");
updates["hash_id"] = update_item->getTransactionID();
// <FS:Ansariel> Check for non-null UUID as in LLViewerInventoryItem::updateServer
//updates["hash_id"] = update_item->getTransactionID();
if(update_item->getTransactionID().notNull())
{
updates["hash_id"] = update_item->getTransactionID();
}
// </FS:Ansariel>
}
AISAPI::completion_t cr = boost::bind(&doInventoryCb, cb, _1);
AISAPI::UpdateItem(item_id, updates, cr);