diff --git a/indra/newview/vjfloaterlocalmesh.cpp b/indra/newview/vjfloaterlocalmesh.cpp index 3f7c636d06..786119281d 100644 --- a/indra/newview/vjfloaterlocalmesh.cpp +++ b/indra/newview/vjfloaterlocalmesh.cpp @@ -466,7 +466,7 @@ void LLFloaterLocalMesh::showLog() void LLFloaterLocalMesh::reloadFileList(bool keep_selection) { - auto& fileinfo_vec = LLLocalMeshSystem::getInstance()->getFileInfoVector(); + const auto& fileinfo_vec = LLLocalMeshSystem::getInstance()->getFileInfoVector(); int selected_num = mScrollCtrl->getFirstSelectedIndex(); mScrollCtrl->clearRows(); @@ -596,7 +596,7 @@ void LLFloaterLocalMesh::reloadLowerUI() std::vector selected_object_list; if (!selected_file_id.isNull()) { - auto& fileinfo_vector = LLLocalMeshSystem::getInstance()->getFileInfoVector(); + const auto& fileinfo_vector = LLLocalMeshSystem::getInstance()->getFileInfoVector(); for (auto fileinfo : fileinfo_vector) { if (selected_file_id == fileinfo.mLocalID) diff --git a/indra/newview/vjlocalmesh.cpp b/indra/newview/vjlocalmesh.cpp index b317889717..55b102e8e3 100644 --- a/indra/newview/vjlocalmesh.cpp +++ b/indra/newview/vjlocalmesh.cpp @@ -641,7 +641,7 @@ bool LLLocalMeshFile::updateLastModified(LLLocalMeshFileLOD lod) std::string current_filename = mFilenames[lod]; #ifndef LL_WINDOWS - const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(mFilename)); + const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(current_filename)); #else const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(utf8str_to_utf16str(current_filename))); #endif diff --git a/indra/newview/vjlocalmeshimportdae.cpp b/indra/newview/vjlocalmeshimportdae.cpp index 2a500ac362..9fb0334ebb 100644 --- a/indra/newview/vjlocalmeshimportdae.cpp +++ b/indra/newview/vjlocalmeshimportdae.cpp @@ -402,9 +402,7 @@ bool LLLocalMeshImportDAE::processObject(domMesh* current_mesh, LLLocalMeshObjec submesh_load_success = readMesh_Polylist(current_submesh.get(), current_polylist_set); break; } - // NOTE: polygon schema - /* case submesh_type::SUBMESH_POLYGONS: { // polygons type schema is deprecated, no modern DCC exports that. @@ -412,7 +410,11 @@ bool LLLocalMeshImportDAE::processObject(domMesh* current_mesh, LLLocalMeshObjec pushLog("DAE Importer", "POLYGONS type schema is deprecated."); break; } - */ + default: + { + pushLog("DAE Importer", "Attempting to load face idx " + std::to_string(idx) + " of unknown type."); + break; + } } if (submesh_load_success) @@ -469,7 +471,7 @@ bool LLLocalMeshImportDAE::processSkin(daeDatabase* collada_db, daeElement* coll pushLog("DAE Importer", "Preparing transformations and bind shape matrix."); // grab transformations - LLVector4 inverse_translation = current_object->getObjectTranslation() *= -1.f; // seems legit + LLVector4 inverse_translation = current_object->getObjectTranslation() * -1.f; LLVector4 objct_size = current_object->getObjectSize(); // this is basically the data_out but for skinning data