diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2019-02-26 16:32:39 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2019-02-26 16:32:39 +0000 |
| commit | 83a6b53ba08ab53757321afdfae723cd7b84a18d (patch) | |
| tree | ce6a5568760f04d38fce322e1011832b673d165a | |
| parent | 5b066ebb7a629c4126b175020712f84cc5800233 (diff) | |
| parent | 9bd1e26b0d7015c2da9f5e65e8ab8437c7e3bf57 (diff) | |
Merged in maxim_productengine/482-fs_mesh_uploader (pull request #1)
SL-10613 Set default 'Smooth' parameter to None
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 10a8a1af3b..5ce62d67d8 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -4625,8 +4625,6 @@ void LLFloaterModelPreview::resetUploadOptions() childSetValue("lod_file_" + lod_name[lod], ""); } - getChild<LLComboBox>("physics_lod_combo")->setCurrentByIndex(0); - for(auto& p : mDefaultDecompParams) { std::string ctrl_name(p.first); @@ -4636,6 +4634,8 @@ void LLFloaterModelPreview::resetUploadOptions() ctrl->setValue(p.second); } } + getChild<LLComboBox>("physics_lod_combo")->setCurrentByIndex(0); + getChild<LLComboBox>("Cosine%")->setCurrentByIndex(0); } void LLFloaterModelPreview::onModelPhysicsFeeReceived(const LLSD& result, std::string upload_url) |