diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-22 11:09:15 -0400 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-22 11:09:15 -0400 | 
| commit | a4c6e3610aa9943825882ff50973ad68c9bad881 (patch) | |
| tree | 27ba412a388d0f831d3d832886785223235d0e05 | |
| parent | 6f4b9d63f8eb97a7c4717a3160de358000b0981b (diff) | |
Import inventory template fix from viewer/viewer-2.0.0-3 rev 133575.
| -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();  } | 
