diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-26 21:00:57 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-26 21:00:57 +0300 |
| commit | 1d22db9ed806e534ce025ca7d9cd07ee16b88e08 (patch) | |
| tree | 17a9188af3608713290e6f49d971b5c7acbdb184 | |
| parent | 067790ffa59afdce183f597070c4b0535708b852 (diff) | |
MAINT-5532 related crash fix and some log improvements
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 10 | ||||
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 24aed7b01b..c1b74b1fd7 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -164,12 +164,12 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa S32 idx_stride = 0; - if ( !get_dom_sources(inputs, pos_offset, tc_offset, norm_offset, idx_stride, pos_source, tc_source, norm_source) || !pos_source ) + if ( !get_dom_sources(inputs, pos_offset, tc_offset, norm_offset, idx_stride, pos_source, tc_source, norm_source)) { return LLModel::BAD_ELEMENT; } - if (!pos_source) + if (!pos_source || !pos_source->getFloat_array()) { LL_WARNS() << "Unable to process mesh without position data; invalid model; invalid model." << LL_ENDL; return LLModel::BAD_ELEMENT; @@ -185,7 +185,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa if (pos_source) { - if(!pos_source->getFloat_array() || (v.getCount() == 0)) + if(v.getCount() == 0) { return LLModel::BAD_ELEMENT; } @@ -898,6 +898,7 @@ bool LLDAELoader::OpenFile(const std::string& filename) result = verifyController( pController ); if (!result) { + LL_INFOS() << "Could not verify controller" << LL_ENDL; setLoadState( ERROR_PARSING ); return true; } @@ -1024,6 +1025,8 @@ bool LLDAELoader::OpenFile(const std::string& filename) } } + LL_INFOS()<< "Collada skins processed: " << count <<LL_ENDL; + daeElement* scene = root->getDescendant("visual_scene"); if (!scene) @@ -1041,6 +1044,7 @@ bool LLDAELoader::OpenFile(const std::string& filename) if ( badElement ) { + LL_INFOS()<<"Scene could not be parsed"<<LL_ENDL; setLoadState( ERROR_PARSING ); } diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index c77a4228f9..20ba7548e5 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3597,7 +3597,7 @@ BOOL LLModelPreview::render() } else { - LL_INFOS(" ") << "Vertex Buffer[" << mPreviewLOD << "]" << " is EMPTY!!!" << LL_ENDL; + LL_INFOS() << "Vertex Buffer[" << mPreviewLOD << "]" << " is EMPTY!!!" << LL_ENDL; regen = TRUE; } } |