summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2013-09-10 14:58:40 -0700
committerDon Kjer <don@lindenlab.com>2013-09-10 14:58:40 -0700
commit3a44c5c2a3e04ed8e7174bedb5753d29e6581019 (patch)
treeab6c7c37f1ce6f72acf7a2060b1b21654e1a92ac /indra
parentf878b032e8c96c4e4ae752864d7641bba2ea4102 (diff)
Fix for SH-4470 when modifying (no copy) or (no transfer) wearables.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewerinventory.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index ede6eb8490..b6a5534815 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1253,12 +1253,17 @@ void update_inventory_item(
if (AISCommand::isAPIAvailable())
{
LLSD updates = update_item->asLLSD();
- // Replace asset_id with transaction_id (hash_id)
+ // Replace asset_id and/or shadow_id with transaction_id (hash_id)
if (updates.has("asset_id"))
{
updates.erase("asset_id");
updates["hash_id"] = update_item->getTransactionID();
}
+ if (updates.has("shadow_id"))
+ {
+ updates.erase("shadow_id");
+ updates["hash_id"] = update_item->getTransactionID();
+ }
LLPointer<AISCommand> cmd_ptr = new UpdateItemCommand(item_id, updates, cb);
ais_ran = cmd_ptr->run_command();
}