From 5bbc33383ed63d4d0c8a4241c8274b32fa5b22cc Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sun, 3 Feb 2013 23:01:22 -0600 Subject: Don't spam the sim with repeated queries for an empty list of materials. --- indra/newview/llmaterialmgr.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp index c93f17859c..6068c2606c 100644 --- a/indra/newview/llmaterialmgr.cpp +++ b/indra/newview/llmaterialmgr.cpp @@ -473,6 +473,11 @@ void LLMaterialMgr::processGetQueue() material_queue_t& materials = itRegionQueue->second; material_queue_t::iterator loopMaterial = materials.begin(); + if (materials.end() == loopMaterial) + { + //LL_INFOS("Material") << "Get queue for region empty, trying next region." << LL_ENDL; + continue; + } while ( (materials.end() != loopMaterial) && (materialsData.size() <= MATERIALS_GET_MAX_ENTRIES) ) { material_queue_t::iterator itMaterial = loopMaterial++; -- cgit v1.2.3