diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-09 12:37:41 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-09 12:37:41 +0800 |
| commit | 381fecfd3e6f724ba0d3ae73ff6b1645521681e9 (patch) | |
| tree | 19d621c92d8ecdeae7cbea3b6bedbc367febf9bb /indra/newview/llmaterialeditor.cpp | |
| parent | 38e93309358700deb15b6b32b6395d1bc08e5525 (diff) | |
| parent | 632a8648ca5456448499a96dcc58c40f4ff80d95 (diff) | |
Merge tag 'Second_Life_Release#632a8648-2025.03' into 2025.03
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, |