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

Material PUT queue entries aren't removed after a request is sent

master
Kitty Barnett 2013-02-04 00:57:45 +01:00
parent ada2d07572
commit 0a99aadd7a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llmaterialmgr.cpp
View File

@ -590,14 +590,7 @@ void LLMaterialMgr::processPutQueue()
std::string materialString = zip_llsd(materialsData);
S32 materialSize = materialString.size();
if (materialSize <= 0)
{
LL_ERRS("debugMaterials") << "cannot zip LLSD binary content" << LL_ENDL;
mPutQueue.erase(itQueue);
continue;
}
else
if (materialSize > 0)
{
LLSD::Binary materialBinary;
materialBinary.resize(materialSize);
@ -609,6 +602,11 @@ void LLMaterialMgr::processPutQueue()
LLHTTPClient::ResponderPtr materialsResponder = new LLMaterialsResponder("PUT", capURL, boost::bind(&LLMaterialMgr::onPutResponse, this, _1, _2));
LLHTTPClient::put(capURL, putData, materialsResponder);
}
else
{
LL_ERRS("debugMaterials") << "cannot zip LLSD binary content" << LL_ENDL;
}
mPutQueue.erase(itQueue);
}
}
@ -636,6 +634,5 @@ void LLMaterialMgr::onRegionRemoved(LLViewerRegion* regionp)
mGetAllPending.erase(region_id);
mGetAllCallbacks.erase(region_id);
// Put
// mPutQueue.erase(region_id);
// Put doesn't need clearing: objects that can't be found will clean up in processPutQueue()
}