diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-21 17:25:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-21 17:25:51 -0400 |
| commit | 2df5b9caa6e5d30f4af91a99a32674938cbc3c1a (patch) | |
| tree | 94415da4f0cf13626f2d143a7c7140af21738e7b | |
| parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) | |
BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid.
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 09c0d01b11..8c5bb3d576 100755 --- 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 diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 17311dd75e..b47fe9d4b1 100755 --- 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; |