diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2020-05-06 09:43:25 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2020-05-06 09:43:25 -0700 |
| commit | cabbc19e95707400a7632498296cc1012b34bb0f (patch) | |
| tree | 00a1fc15e9fd2c2ee742951967cf37eff22ee47a /indra/newview/llmeshrepository.cpp | |
| parent | 7bf2a1f5fef557e4531731c608c8dd924c97bc39 (diff) | |
| parent | 7449f4b6d770be9d56ee5fa3d20b6b59d816719c (diff) | |
DRTVWR-510: Fix merge conflict
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 1d76dd7928..1fce158eb4 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1888,7 +1888,7 @@ EMeshProcessingResult LLMeshRepoThread::lodReceived(const LLVolumeParams& mesh_p std::string mesh_string((char*)data, data_size); stream.str(mesh_string); } - catch (std::bad_alloc) + catch (std::bad_alloc&) { // out of memory, we won't be able to process this mesh return MESH_OUT_OF_MEMORY; |