diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-05-25 08:35:51 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-05-25 08:35:51 +0000 |
| commit | bcb5336958e30bf56b2f327235c3731407b34530 (patch) | |
| tree | 384c333370a24fca38c77b0cd72f195a1a0ce882 /indra/newview/llfloatermodelpreview.cpp | |
| parent | a28a3b756d7688fcb917122efee01f16ab5319cd (diff) | |
| parent | 5219e6c455c92d789c25909d02bf094886fad3d9 (diff) | |
Merged in andreyl_productengine/viewer-neko-marchcat (pull request #613)
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index da84a6b8f8..7a2ab37a0d 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -218,9 +218,17 @@ LLMeshFilePicker::LLMeshFilePicker(LLModelPreview* mp, S32 lod) mLOD = lod; } -void LLMeshFilePicker::notify(const std::string& filename) +void LLMeshFilePicker::notify(const std::vector<std::string>& filenames) { - mMP->loadModel(mFile, mLOD); + if (filenames.size() > 0) + { + mMP->loadModel(filenames[0], mLOD); + } + else + { + //closes floater + mMP->loadModel(std::string(), mLOD); + } } void FindModel(LLModelLoader::scene& scene, const std::string& name_to_match, LLModel*& baseModelOut, LLMatrix4& matOut) |