summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-01-20 09:46:25 -0800
committerRider Linden <rider@lindenlab.com>2016-01-20 09:46:25 -0800
commite5bfdac02449410c13a837dfc05d10fafe2eb042 (patch)
treef6689b85e15c039fe8823aab1d494bbb46795bd2 /indra/newview
parentf7ab5676219312867f829d2c70275f8b1ebbe10e (diff)
MAINT-6071: Change reference to a copy to avoid later use of erased variable.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llmaterialmgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
index 9ac560c217..f996557c17 100755
--- a/indra/newview/llmaterialmgr.cpp
+++ b/indra/newview/llmaterialmgr.cpp
@@ -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);