diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:23 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:23 +0300 |
| commit | 67d8dda08cfc2310614c2a984280e07c68cf41f6 (patch) | |
| tree | 2eca22cf749758b3b49e36d8c83e1d26c5e77641 /indra/newview/llmeshrepository.cpp | |
| parent | c45373309d29b267d3411683892f066c682d638a (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' into DRTVWR-483
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; |