From 59356963c4a34081a0c0fb0235c267c06fbcb832 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 11 Jan 2022 21:13:17 +0200
Subject: SL-16614 Viewer's uploader crash with RenderGLCoreProfile

---
 indra/newview/llfloatermodelpreview.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'indra/newview/llfloatermodelpreview.cpp')

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 64b24d54c3..6d23d14374 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -40,6 +40,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcombobox.h"
+#include "llfloaterreg.h"
 #include "llfocusmgr.h"
 #include "llmeshrepository.h"
 #include "llnotificationsutil.h"
@@ -347,6 +348,26 @@ void LLFloaterModelPreview::initModelPreview()
 	mModelPreview->setModelUpdatedCallback(boost::bind(&LLFloaterModelPreview::modelUpdated, this, _1));
 }
 
+//static
+bool LLFloaterModelPreview::showModelPreview()
+{
+#ifdef LL_GLOD
+    if (LLRender::sGLCoreProfile)
+    {
+        // GLOD is incompatible with RenderGLCoreProfile, will crash on init
+        LLNotificationsUtil::add("MeshUploadProfilerError");
+        return false;
+    }
+#endif
+
+    LLFloaterModelPreview* fmp = (LLFloaterModelPreview*)LLFloaterReg::getInstance("upload_model");
+    if (fmp && !fmp->isModelLoading())
+    {
+        fmp->loadHighLodModel();
+    }
+    return true;
+}
+
 void LLFloaterModelPreview::onUploadOptionChecked(LLUICtrl* ctrl)
 {
 	if (mModelPreview)
-- 
cgit v1.3