From 78eace26b30e37f16df6b20728d58e029d029ee9 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 26 May 2016 02:22:38 -0500
Subject: [PATCH] Buffer overrun in LLMeshRepository::notifyLoadedMeshes

---
 indra/newview/llmeshrepository.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index e186b1c02..160d2aaa6 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2557,6 +2557,8 @@ void LLMeshRepository::notifyLoadedMeshes()
 
 		S32 push_count = LLMeshRepoThread::sMaxConcurrentRequests-(LLMeshRepoThread::sActiveHeaderRequests+LLMeshRepoThread::sActiveLODRequests);
 
+		push_count = llmin(push_count, (S32)mPendingRequests.size());
+
 		if (push_count > 0)
 		{
 			//calculate "score" for pending requests