diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
| commit | 524fbefd2a3b7c6955d5929d7d121ede2386c1df (patch) | |
| tree | 1eccde9b330abd27f81bfaebde29e7fa443f132a /indra/newview/llfloatermodelpreview.cpp | |
| parent | 0b78b5a2f093ea8df3484e893eda670e4c87cff7 (diff) | |
| parent | 21f19cb6f036787d93b186d6fcfd595ae6f03d87 (diff) | |
Merge
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) |