diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-04-06 15:01:28 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-04-07 21:13:48 +0300 |
| commit | a7a8d6c02e781188ad93280490be495dab5296ab (patch) | |
| tree | e9dca4c5b17eaae0d7e89b136c33cfaaa590dbb5 /indra/newview/llmaterialeditor.cpp | |
| parent | 40acaafd9c5b224a6e684db3b09f3360e92ed34e (diff) | |
#3627 std::bad_alloc when loading a model
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 1e3a328464..28160177f6 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -2857,9 +2857,16 @@ void LLMaterialEditor::importMaterial() { return; } - if (filenames.size() > 0) + try { - LLMaterialEditor::loadMaterialFromFile(filenames[0], -1); + if (filenames.size() > 0) + { + LLMaterialEditor::loadMaterialFromFile(filenames[0], -1); + } + } + catch (std::bad_alloc&) + { + LLNotificationsUtil::add("CannotOpenFileTooBig"); } }, LLFilePicker::FFLOAD_MATERIAL, |