diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cf07350d85..3c309f93bc 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5587,7 +5587,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <real>0</real> + <real>1</real> </map> <key>MeshUploadLogXML</key> <map> diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 0006e3423b..67841620ea 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1968,10 +1968,6 @@ bool LLModelLoader::loadFromSLM(const std::string& filename) mPreview->critiqueRigForUploadApplicability( loaded_model->mSkinInfo.mJointNames ); } } - else - { - return false; - } } } @@ -1980,6 +1976,12 @@ 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; |