diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-08-18 11:31:16 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-08-18 11:31:16 -0400 |
| commit | 1e6d9ba4be8333293841fa35e7650f59adcc245d (patch) | |
| tree | b15864f80eab05624463ce6a3d66198f5eba4819 /indra/newview | |
| parent | f51c1553bc3b8b21057a27e3aba2a3af976503dd (diff) | |
MAINT-6647 - make SLM files even more dead.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8735ca6026..0a9f1a44f0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6440,7 +6440,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>MeshUploadLogXML</key> <map> diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 1fd2d429a7..3b7f09b27b 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -4244,7 +4244,9 @@ void LLFloaterModelPreview::onUpload(void* user_data) bool upload_skinweights = mp->childGetValue("upload_skin").asBoolean(); bool upload_joint_positions = mp->childGetValue("upload_joints").asBoolean(); - mp->mModelPreview->saveUploadData(upload_skinweights, upload_joint_positions); + + // MAINT-6647 - removed SLM files + //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, |