diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-08-19 09:47:26 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-08-19 09:47:26 -0400 |
| commit | d23bb7e05667d722c38208419c137a0bb13ca6c4 (patch) | |
| tree | 31cca5798159d7fd414e2bfab8417184a7f21c60 /indra/newview | |
| parent | 1e6d9ba4be8333293841fa35e7650f59adcc245d (diff) | |
MAINT-6647 - make SLM behavior still available if MeshImportUseSLM is true; still defaults to false.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 3b7f09b27b..93775b62ed 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1667,10 +1667,6 @@ void LLModelPreview::saveUploadData(bool save_skinweights, bool save_joint_posit void LLModelPreview::saveUploadData(const std::string& filename, bool save_skinweights, bool save_joint_positions) { - if (!gSavedSettings.getBOOL("MeshImportUseSLM")) - { - return; - } std::set<LLPointer<LLModel> > meshes; std::map<LLModel*, std::string> mesh_binary; @@ -4245,8 +4241,10 @@ void LLFloaterModelPreview::onUpload(void* user_data) bool upload_joint_positions = mp->childGetValue("upload_joints").asBoolean(); - // MAINT-6647 - removed SLM files - //mp->mModelPreview->saveUploadData(upload_skinweights, upload_joint_positions); + if (gSavedSettings.getBOOL("MeshImportUseSLM")) + { + mp->mModelPreview->saveUploadData(upload_skinweights, upload_joint_positions); + } gMeshRepo.uploadModel(mp->mModelPreview->mUploadData, mp->mModelPreview->mPreviewScale, mp->childGetValue("upload_textures").asBoolean(), upload_skinweights, upload_joint_positions, mp->mUploadModelUrl, diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index c4e42c76bd..217ac35888 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -106,7 +106,7 @@ public: void refresh(); void loadModel(S32 lod); - void loadModel(S32 lod, const std::string& file_name, bool force_disable_slm = true); + void loadModel(S32 lod, const std::string& file_name, bool force_disable_slm = false); void onViewOptionChecked(LLUICtrl* ctrl); bool isViewOptionChecked(const LLSD& userdata); @@ -261,7 +261,7 @@ public: void setPreviewLOD(S32 lod); void clearModel(S32 lod); void getJointAliases(JointMap& joint_map); - void loadModel(std::string filename, S32 lod, bool force_disable_slm = true); + void loadModel(std::string filename, S32 lod, bool force_disable_slm = false); void loadModelCallback(S32 lod); bool lodsReady() { return !mGenLOD && mLodsQuery.empty(); } void queryLODs() { mGenLOD = true; }; |