diff options
| author | Tonya Souther <tonya.souther@gmail.com> | 2013-02-03 23:01:22 -0600 |
|---|---|---|
| committer | Tonya Souther <tonya.souther@gmail.com> | 2013-02-03 23:01:22 -0600 |
| commit | 5bbc33383ed63d4d0c8a4241c8274b32fa5b22cc (patch) | |
| tree | f1d3cd71717f89ab6ee54f6f725aa98a43305097 | |
| parent | da82358116606a76c84379fe8877ec7339c169e2 (diff) | |
Don't spam the sim with repeated queries for an empty list of materials.
| -rw-r--r-- | indra/newview/llmaterialmgr.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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++; |