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

Appears to fix MAINT-4184

master
Aura Linden 2014-07-22 17:24:00 -07:00
parent 2121ffcdab
commit 3d4acb535d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llmessage/lltransfermanager.cpp
View File

@ -1260,9 +1260,13 @@ bool LLTransferTarget::addDelayedPacket(
size); size);
#ifdef _DEBUG #ifdef _DEBUG
if (mDelayedPacketMap.find(packet_id) != mDelayedPacketMap.end()) transfer_packet_map::iterator iter = mDelayedPacketMap.find(packet_id);
if (iter != mDelayedPacketMap.end())
{ {
LL_ERRS() << "Packet ALREADY in delayed packet map!" << LL_ENDL; if (!(iter->second->mSize == size) && !(iter->second->mDatap == datap))
{
LL_ERRS() << "Packet ALREADY in delayed packet map!" << LL_ENDL;
}
} }
#endif #endif

3
indra/newview/lltexturefetch.cpp
View File

@ -2648,7 +2648,8 @@ bool LLTextureFetch::createRequest(FTType f_type, const std::string& url, const
worker->setImagePriority(priority); worker->setImagePriority(priority);
worker->setDesiredDiscard(desired_discard, desired_size); worker->setDesiredDiscard(desired_discard, desired_size);
worker->setCanUseHTTP(can_use_http); worker->setCanUseHTTP(can_use_http);
worker->setUrl(url);
//worker->setUrl(url); //MAINT-4184 this line seems to be the cause and url is always blank.
if (!worker->haveWork()) if (!worker->haveWork())
{ {
worker->setState(LLTextureFetchWorker::INIT); worker->setState(LLTextureFetchWorker::INIT);