From 741b79d63b97bb5e43f758fd93854317f0bdc65f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 21 May 2024 21:12:41 +0300 Subject: viewer#1529 Mesh Uploader should permit lowering material count --- indra/newview/llmodelpreview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llmodelpreview.cpp') diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index 736971276e..ac41558721 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -2285,7 +2285,7 @@ void LLModelPreview::updateStatusMessages() if (lod != lod_high) { - if (total_submeshes[lod] && total_submeshes[lod] != total_submeshes[lod_high]) + if (total_submeshes[lod] && total_submeshes[lod] > total_submeshes[lod_high]) { //number of submeshes is different message = "mesh_status_submesh_mismatch"; upload_status[lod] = 2; -- cgit v1.3 From a510a1da004a9299d5389e77bb9aa43ae1cc1c60 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 15 Oct 2024 22:46:23 +0200 Subject: Convert BOOL to bool # Conflicts: # indra/newview/llagent.cpp --- indra/newview/llinventorypanel.cpp | 2 +- indra/newview/llmodelpreview.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llmodelpreview.cpp') diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 303df07ecf..aba17c99d0 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -2438,7 +2438,7 @@ void LLInventoryFavoritesItemsPanel::itemChanged(const LLUUID& id, U32 mask, con LLFavoritesCollector is_favorite; LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t item_array; - gInventory.collectDescendentsIf(id, cat_array, item_array, FALSE, is_favorite); + gInventory.collectDescendentsIf(id, cat_array, item_array, false, is_favorite); for (LLInventoryModel::cat_array_t::const_iterator it = cat_array.begin(); it != cat_array.end(); ++it) { removeFavorite((*it)->getUUID(), *it); diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index 1412001a39..6fba0e4216 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -3325,7 +3325,6 @@ bool LLModelPreview::render() fmp->setViewOptionEnabled("show_skin_weight", show_skin_weight); } } - //if (this) return TRUE; if (upload_skin && !has_skin_weights) { //can't upload skin weights if model has no skin weights -- cgit v1.3