diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-05-29 01:02:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-29 01:02:06 +0300 |
| commit | 96023976f5af0b9af8e8d066d9ad4eea213f53ee (patch) | |
| tree | 56b5fadba1f247fc42b6d3a3062154d61a43abac /indra/newview/llmaterialeditor.cpp | |
| parent | 3af711e6da9d0004ce1b565bfadee634f087b89a (diff) | |
| parent | d3bd73ab923b8010bb395505b95bcc38b661162e (diff) | |
Merge pull request #4181 from secondlife/marchcat/slua-editor-merge
SLua editor: Post-release merge
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, |