merge changes for maint-2628

2013-05-21 19:05:23 -04:00 · 2013-05-21 19:05:23 -04:00 · 4f08780b00
parent 10f2060547 2df5b9caa6
commit 4f08780b00
2 changed files with 2 additions and 1 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -900,6 +900,7 @@ Nicky Dasmijn
 	VWR-29228
 	MAINT-873
 	SUN-72
+	BUG-2432
 Nicky Perian
 	OPEN-1
 	STORM-1087
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@ -1215,8 +1215,8 @@ bool LLMeshRepoThread::headerReceived(const LLVolumeParams& mesh_params, U8* dat
 				mLODReqQ.push(req);
 				LLMeshRepository::sLODProcessing++;
 			}
+			mPendingLOD.erase(iter);
 		}
-		mPendingLOD.erase(iter);
 	}

 	return true;