diff options
author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2020-11-18 21:09:57 +0200 |
---|---|---|
committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2020-11-18 21:09:57 +0200 |
commit | 12d2bf47865559a8da087f6e3bbb4b65d421169c (patch) | |
tree | 9c210aad081f40d7601faba8601aadf8ba6d4ab5 /indra/newview/llfloatermodelpreview.cpp | |
parent | 1416c4d5c20f90f40093bd6b5a2b41414eaee54d (diff) |
SL-14286 fixed crash when closing viewer while file picker is open
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index b9c03f66a3..999e4a9582 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -103,6 +103,11 @@ LLMeshFilePicker::LLMeshFilePicker(LLModelPreview* mp, S32 lod) void LLMeshFilePicker::notify(const std::vector<std::string>& filenames) { + if(LLAppViewer::instance()->quitRequested()) + { + return; + } + if (filenames.size() > 0) { mMP->loadModel(filenames[0], mLOD); |