diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-03-02 19:46:48 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-03-02 19:46:48 +0200 |
| commit | f90d17905899d01db76b82b6d647bbecf1c47f23 (patch) | |
| tree | dba8f9a514a02a9d86fe25c5d0ffccf30a6b754f /indra/newview/llfloatermodelpreview.cpp | |
| parent | 064f28b290026be0e77cd38de78b06477a9c0876 (diff) | |
| parent | 97a103255e433629f13e2156aa307ca329cdcfc6 (diff) | |
Merge branch 'DRTVWR-546' into DRTVWR-539
# Conflicts:
# indra/llcommon/tests/llprocess_test.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llcombobox.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 6135c4f13e..fe5120376c 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -351,15 +351,6 @@ void LLFloaterModelPreview::initModelPreview() //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()) { |