diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-22 11:13:54 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-22 11:13:54 -0400 |
| commit | 103ba961e4694b0346b43e4301cc623093733d15 (patch) | |
| tree | 2a42fea6718ffed56303cb37406295c7c5059eb1 | |
| parent | b5ed4fec54f58e285cdb1eea97d25d503f7bba70 (diff) | |
| parent | a4c6e3610aa9943825882ff50973ad68c9bad881 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index f3557bb8f7..176e1b5499 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -901,20 +901,27 @@ void link_inventory_item( return; } + LLUUID transaction_id; + std::string desc = "Link"; + LLInventoryType::EType inv_type = LLInventoryType::IT_NONE; + LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_LinkInventoryItem); - msg->nextBlockFast(_PREHASH_AgentData); + msg->nextBlock(_PREHASH_AgentData); { msg->addUUIDFast(_PREHASH_AgentID, agent_id); msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); } - msg->nextBlockFast(_PREHASH_InventoryData); + msg->nextBlock(_PREHASH_InventoryBlock); { msg->addU32Fast(_PREHASH_CallbackID, gInventoryCallbacks.registerCB(cb)); msg->addUUIDFast(_PREHASH_FolderID, parent_id); + msg->addUUIDFast(_PREHASH_TransactionID, transaction_id); msg->addUUIDFast(_PREHASH_OldItemID, item_id); + msg->addS8Fast(_PREHASH_Type, (S8)asset_type); + msg->addS8Fast(_PREHASH_InvType, (S8)inv_type); msg->addStringFast(_PREHASH_Name, new_name); - msg->addU8Fast(_PREHASH_AssetType, asset_type); + msg->addStringFast(_PREHASH_Description, desc); } gAgent.sendReliableMessage(); } |