summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2013-02-04 00:57:45 +0100
committerKitty Barnett <develop@catznip.com>2013-02-04 00:57:45 +0100
commit0a99aadd7a9d5d5166ef4e581b935adc6fb034ea (patch)
tree25b9ae3bf2b252cc1875aa60378e24a670891000 /indra
parentada2d07572ca51159004eec82721d3dabe735bb8 (diff)
Material PUT queue entries aren't removed after a request is sent
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmaterialmgr.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
index 3138bfd4e1..c93f17859c 100644
--- a/indra/newview/llmaterialmgr.cpp
+++ b/indra/newview/llmaterialmgr.cpp
@@ -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()
}