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

[FIXED] Previous merge with default tip introduced a code artifact 

--HG--
branch : Viewer-Build
meow-7.2.2
Kitty Barnett 2016-08-26 22:32:31 +02:00
parent f47958bd2b
commit 74198479a5
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -1037,6 +1037,7 @@ e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release
0000000000000000000000000000000000000000 4.0.4-release
0000000000000000000000000000000000000000 4.0.5-release
0000000000000000000000000000000000000000 4.0.6-release
0000000000000000000000000000000000000000 4.0.7-release
4f777ffb99fefdc6497c61385c22688ff149c659 SL-2.0.0
668851b2ef0f8cf8df07a0fba429e4a6c1e70abb SL-2.0.1
b03065d018b8a2e28b7de85b293a4c992cb4c12d SL-2.1.0

31
indra/newview/llinventoryobserver.cpp
View File

@ -241,32 +241,11 @@ void fetch_items_from_llsd(const LLSD& items_llsd)
gInventory.requestPost(true, url, body[i], handler, (i ? "Library Item" : "Inventory Item"));
continue;
}
LLMessageSystem* msg = gMessageSystem;
BOOL start_new_message = TRUE;
for (S32 j=0; j<body[i]["items"].size(); j++)
{
LLSD item_entry = body[i]["items"][j];
if (start_new_message)
{
start_new_message = FALSE;
msg->newMessageFast(_PREHASH_FetchInventory);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
}
msg->nextBlockFast(_PREHASH_InventoryData);
msg->addUUIDFast(_PREHASH_OwnerID, item_entry["owner_id"].asUUID());
msg->addUUIDFast(_PREHASH_ItemID, item_entry["item_id"].asUUID());
if (msg->isSendFull(NULL))
{
start_new_message = TRUE;
gAgent.sendReliableMessage();
}
}
if (!start_new_message)
{
gAgent.sendReliableMessage();
}
else
{
LL_WARNS("INVENTORY") << "Failed to get capability." << LL_ENDL;
}
}
}