From a24ba60d4c208fe5993290e1fa63dbc37e6e8b8f Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 24 Aug 2023 16:18:02 +0200 Subject: [PATCH 1/3] Fix compile error. Looks like code duplication that was never fixed because nobody ever compiles with asserts turned on (ouch). --- indra/newview/llmodelpreview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index 1f75e1b590..dcada3c7d1 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -2523,7 +2523,7 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d out << "Invalid level of detail: " << which_lod; LL_WARNS() << out.str() << LL_ENDL; LLFloaterModelPreview::addStringToLog(out, true); // if you don't flash the log tab on error when do you? - assert(lod >= -1 && lod < LLModel::NUM_LODS); + assert(which_lod >= -1 && which_lod < LLModel::NUM_LODS); return; } From d1e8a2e5573c4cdc66304b659c34f731ece68334 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sat, 26 Aug 2023 15:54:55 +0200 Subject: [PATCH 2/3] Add FS tag. I have no idea if I can use (it isn't used elsewhere right now). If the FS tags are meant only for those with write access to the repository then I guess it should be changed into . --- indra/newview/llmodelpreview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index dcada3c7d1..6a442a14d4 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -2523,7 +2523,7 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d out << "Invalid level of detail: " << which_lod; LL_WARNS() << out.str() << LL_ENDL; LLFloaterModelPreview::addStringToLog(out, true); // if you don't flash the log tab on error when do you? - assert(which_lod >= -1 && which_lod < LLModel::NUM_LODS); + assert(which_lod >= -1 && which_lod < LLModel::NUM_LODS); // use the correct variable (which_lod). return; } From d78f0e4258607d140c4232cea9e27a4395dbaec1 Mon Sep 17 00:00:00 2001 From: Beq Janus Date: Sun, 27 Aug 2023 20:33:34 +0100 Subject: [PATCH 3/3] alter the tag to suggested format for PR sourced changes --- indra/newview/llmodelpreview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index 6a442a14d4..bd29b2165f 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -2523,7 +2523,7 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d out << "Invalid level of detail: " << which_lod; LL_WARNS() << out.str() << LL_ENDL; LLFloaterModelPreview::addStringToLog(out, true); // if you don't flash the log tab on error when do you? - assert(which_lod >= -1 && which_lod < LLModel::NUM_LODS); // use the correct variable (which_lod). + assert(which_lod >= -1 && which_lod < LLModel::NUM_LODS); // use the correct variable (which_lod). return; }