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

MAINT-6071: Change reference to a copy to avoid later use of erased variable.

master
Rider Linden 2016-01-20 09:46:25 -08:00
parent f7ab567621
commit e5bfdac024
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llmaterialmgr.cpp
View File

@ -599,7 +599,7 @@ void LLMaterialMgr::processGetQueue()
//
get_queue_t::iterator itRegionQueue = loopRegionQueue++;
const LLUUID& region_id = itRegionQueue->first;
LLUUID region_id = itRegionQueue->first;
if (isGetAllPending(region_id))
{
continue;
@ -647,6 +647,7 @@ void LLMaterialMgr::processGetQueue()
if (materials.empty())
{
mGetQueue.erase(itRegionQueue);
// $TODO*: We may be able to issue a continue here. Research.
}
std::string materialString = zip_llsd(materialsData);