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

DRTVWR-397 WIP - logging updates and fixes

meow-7.2.2
Brad Payne (Vir Linden) 2015-03-31 14:18:49 -04:00
parent f0381cfc3e
commit b40bdb266a
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llattachmentsmgr.cpp
View File

@ -94,6 +94,8 @@ void LLAttachmentsMgr::onIdle()
linkRecentlyArrivedAttachments();
expireOldAttachmentRequests();
expireOldDetachRequests();
}
void LLAttachmentsMgr::requestPendingAttachments()
@ -308,17 +310,35 @@ void LLAttachmentsMgr::expireOldAttachmentRequests()
{
std::map<LLUUID,LLTimer>::iterator curr_it = it;
++it;
if (it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
if (curr_it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
{
LLInventoryItem *item = gInventory.getItem(curr_it->first);
LL_DEBUGS("Avatar") << "ATT expiring request for attachment "
<< (item ? item->getName() : "UNKNOWN") << "item_id " << curr_it->first
<< (item ? item->getName() : "UNKNOWN") << " item_id " << curr_it->first
<< " after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds" << LL_ENDL;
mAttachmentRequests.erase(curr_it);
}
}
}
void LLAttachmentsMgr::expireOldDetachRequests()
{
for (std::map<LLUUID,LLTimer>::iterator it = mDetachRequests.begin();
it != mDetachRequests.end(); )
{
std::map<LLUUID,LLTimer>::iterator curr_it = it;
++it;
if (curr_it->second.getElapsedTimeF32() > MAX_ATTACHMENT_REQUEST_LIFETIME)
{
LLInventoryItem *item = gInventory.getItem(curr_it->first);
LL_DEBUGS("Avatar") << "ATT expiring request for detach "
<< (item ? item->getName() : "UNKNOWN") << " item_id " << curr_it->first
<< " after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds" << LL_ENDL;
mDetachRequests.erase(curr_it);
}
}
}
// When an attachment arrives, we want to stop waiting for it, and add
// it to the set of recently arrived items.
void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)

1
indra/newview/llattachmentsmgr.h
View File

@ -107,6 +107,7 @@ private:
void requestPendingAttachments();
void linkRecentlyArrivedAttachments();
void expireOldAttachmentRequests();
void expireOldDetachRequests();
// Attachments that we are planning to rez but haven't requested from the server yet.
attachments_vec_t mPendingAttachments;