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

Merge stray fix for infinite "get all" request loop on non-material regions

master
Kitty Barnett 2013-02-24 23:42:53 +01:00
parent 5711bda96a b4a87776d4
commit 4d1446766a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llmaterialmgr.cpp
View File

@ -548,7 +548,7 @@ void LLMaterialMgr::processGetAllQueue()
if (regionp == NULL)
{
LL_WARNS("Materials") << "Unknown region with id " << region_id.asString() << LL_ENDL;
mGetAllQueue.erase(itRegion);
clearGetQueues(region_id); // Invalidates region_id
continue;
}
else if (!regionp->capabilitiesReceived())
@ -561,7 +561,7 @@ void LLMaterialMgr::processGetAllQueue()
{
LL_WARNS("Materials") << "Capability '" << MATERIALS_CAPABILITY_NAME
<< "' is not defined on the current region '" << regionp->getName() << "'" << LL_ENDL;
mGetAllQueue.erase(itRegion);
clearGetQueues(region_id); // Invalidates region_id
continue;
}
@ -647,11 +647,8 @@ void LLMaterialMgr::processPutQueue()
}
}
void LLMaterialMgr::onRegionRemoved(LLViewerRegion* regionp)
void LLMaterialMgr::clearGetQueues(const LLUUID& region_id)
{
const LLUUID& region_id = regionp->getRegionID();
// Get
mGetQueue.erase(region_id);
for (get_pending_map_t::iterator itPending = mGetPending.begin(); itPending != mGetPending.end();)
{
@ -665,12 +662,14 @@ void LLMaterialMgr::onRegionRemoved(LLViewerRegion* regionp)
}
}
LL_DEBUGS("Materials") << regionp->getName() << " id " << region_id << LL_ENDL;
// Get all
mGetAllQueue.erase(region_id);
mGetAllRequested.erase(region_id);
mGetAllPending.erase(region_id);
mGetAllCallbacks.erase(region_id);
}
void LLMaterialMgr::onRegionRemoved(LLViewerRegion* regionp)
{
clearGetQueues(regionp->getRegionID());
// Put doesn't need clearing: objects that can't be found will clean up in processPutQueue()
}

1
indra/newview/llmaterialmgr.h
View File

@ -52,6 +52,7 @@ public:
void put(const LLUUID& object_id, const U8 te, const LLMaterial& material);
protected:
void clearGetQueues(const LLUUID& region_id);
bool isGetPending(const LLUUID& region_id, const LLMaterialID& material_id);
bool isGetAllPending(const LLUUID& region_id);
const LLMaterialPtr setMaterial(const LLUUID& region_id, const LLMaterialID& material_id, const LLSD& material_data);