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

Fix error with message template incompatibility for LinkInventoryItem.Merging newinventorymsg__merge__viewer-2.0.0-3__r131585 into viewer-2 trunk, see QAR-1804 and QAR-1805. 

Merging revisions 131698-132325 of svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/newinventorymsg__merge__viewer-2.0.0-3__r131585 into D:\viewer-2.0.0-3, respecting ancestry
meow-7.2.2
James Cook 2009-09-17 16:53:36 +00:00
parent 1939e3fe00
commit 053b14a97a
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llviewerinventory.cpp
View File

@ -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();
}

10
scripts/messages/message_template.msg
View File

@ -8946,6 +8946,7 @@ version 2.0
}
}
// Link inventory
{
LinkInventoryItem Low 426 NotTrusted Zerocoded
{
@ -8954,12 +8955,15 @@ version 2.0
{ SessionID LLUUID }
}
{
InventoryData Variable
InventoryBlock Single
{ CallbackID U32 } // Async Response
{ FolderID LLUUID }
{ TransactionID LLUUID } // Going to become TransactionID
{ OldItemID LLUUID }
{ Type S8 }
{ InvType S8 }
{ Name Variable 1 }
{ AssetType U8 }
{ Description Variable 1 }
}
}