Clean up pending requests when regions are removed from LLWorld

1 files changed, 25 insertions, 0 deletions

diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
index f623ca11ec..1daeedb8b0 100644
--- a/indra/newview/llmaterialmgr.cpp
+++ b/indra/newview/llmaterialmgr.cpp
@@ -112,6 +112,7 @@ void LLMaterialsResponder::error(U32 pStatus, const std::string& pReason)
 LLMaterialMgr::LLMaterialMgr()
 {
 	gIdleCallbacks.addFunction(&LLMaterialMgr::onIdle, NULL);
+	LLWorld::instance().setRegionRemovedCallback(boost::bind(&LLMaterialMgr::onRegionRemoved, this, _1));
 }
 
 LLMaterialMgr::~LLMaterialMgr()
@@ -607,3 +608,27 @@ void LLMaterialMgr::processPutQueue()
 		}
 	}
 }
+
+void LLMaterialMgr::onRegionRemoved(LLViewerRegion* regionp)
+{
+	const LLUUID& region_id = regionp->getRegionID();
+
+	// Get
+	mGetQueue.erase(region_id);
+	for (get_pending_map_t::const_iterator itPending = mGetPending.begin(); itPending != mGetPending.end();)
+	{
+		if (region_id == itPending->first.first)
+			mGetPending.erase(itPending++);
+		else
+			++itPending;
+	}
+
+	// Get all
+	mGetAllQueue.erase(region_id);
+	mGetAllRequested.erase(region_id);
+	mGetAllPending.erase(region_id);
+	mGetAllCallbacks.erase(region_id);
+
+	// Put
+//	mPutQueue.erase(region_id);
+}