1 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp
index 43e8fa3e3c..9a381f9ba6 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,
@@ -636,6 +643,12 @@ void GLTFSceneManager::render(Asset& asset, U8 variant)
         return;
     }
 
+    if (gGLTFPBRMetallicRoughnessProgram.mGLTFVariants.size() <= variant)
+    {
+        llassert(false); // mGLTFVariants should have been initialized
+        return;
+    }
+
     for (U32 ds = 0; ds < 2; ++ds)
     {
         RenderData& rd = asset.mRenderData[ds];