From e5bfdac02449410c13a837dfc05d10fafe2eb042 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 20 Jan 2016 09:46:25 -0800
Subject: [PATCH] MAINT-6071: Change reference to a copy to avoid later use of
erased variable.
---
indra/newview/llmaterialmgr.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
index 9ac560c217c..f996557c17a 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);
--
GitLab