summaryrefslogtreecommitdiff
path: root/indra/newview/llmodelpreview.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-09-09 14:23:24 +0800
committerErik Kundiman <erik@megapahit.org>2025-09-09 14:23:24 +0800
commit693137a6487e6ffda9ff15ade62d0e8bfec1bf49 (patch)
tree12c078a35bebfd139d108f5fb7cd6c7fc4455c70 /indra/newview/llmodelpreview.cpp
parentb9ab04cd6e253848bad865fc1b5ea993a2a060f3 (diff)
parent8a9a3dc9d760db37bb963d3e5bfadafdd94ee08d (diff)
Merge branch '2025.06'
Diffstat (limited to 'indra/newview/llmodelpreview.cpp')
-rw-r--r--indra/newview/llmodelpreview.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 01d4ccecdd..887d53b918 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -2393,7 +2393,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;
@@ -3395,7 +3395,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