summaryrefslogtreecommitdiff
path: root/indra/newview/gltfscenemanager.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2025-04-06 15:01:28 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-04-06 22:40:42 +0300
commitf6a2dbe6ec3dbe059ca25cfcd2348619aeacb46b (patch)
treeac25cde90c2cc0d1a8197afc5b94e89a68eb2dbc /indra/newview/gltfscenemanager.cpp
parentcc54e206c3ea390a3a14829a4ac40ce5d98f5965 (diff)
#3627 std::bad_alloc when loading a model
Diffstat (limited to 'indra/newview/gltfscenemanager.cpp')
-rw-r--r--indra/newview/gltfscenemanager.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp
index c33d15228c..e0cd762776 100644
--- a/indra/newview/gltfscenemanager.cpp
+++ b/indra/newview/gltfscenemanager.cpp
@@ -69,9 +69,16 @@ void GLTFSceneManager::load()
{
return;
}
- if (filenames.size() > 0)
+ try
+ {
+ if (filenames.size() > 0)
+ {
+ GLTFSceneManager::instance().load(filenames[0]);
+ }
+ }
+ catch (std::bad_alloc&)
{
- GLTFSceneManager::instance().load(filenames[0]);
+ LLNotificationsUtil::add("CannotOpenFileTooBig");
}
},
LLFilePicker::FFLOAD_GLTF,