diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-06 19:27:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-06 19:27:43 -0500 |
| commit | 9b253ccf68718dea51dc94416b3ece28b42fc32a (patch) | |
| tree | 74639cf7e73c17d28222a95e4d44728eaa78ee0d /indra/newview | |
| parent | 71eb68a85d5a5157622ae8f42bac1c21f00d54cd (diff) | |
SH-1972 Fix for slm messing up physics shape on second upload.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index a452bcebb2..ab370a221f 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2034,12 +2034,6 @@ bool LLModelLoader::loadFromSLM(const std::string& filename) return false; } - if (model[LLModel::LOD_PHYSICS].empty()) - { //no explicit physics block, copy HIGH_LOD into physics array to recover convex decomp - model[LLModel::LOD_PHYSICS] = model[LLModel::LOD_HIGH]; - } - - //load instance list model_instance_list instance_list; @@ -3248,7 +3242,7 @@ void LLModelPreview::saveUploadData(const std::string& filename, bool save_skinw instance.mLOD[LLModel::LOD_LOW], instance.mLOD[LLModel::LOD_IMPOSTOR], decomp, - save_skinweights, save_joint_positions); + save_skinweights, save_joint_positions, FALSE, TRUE); data["mesh"][instance.mModel->mLocalID] = str.str(); |