From aaddcc0b704f28555fbd4a1f6068f44242966295 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 30 Mar 2020 20:04:25 +0300 Subject: SL-307 A separator to see where model loading logs ends and other state starts --- indra/newview/llfloatermodelpreview.cpp | 4 ++++ indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index f99b42ab2c..b0dfe19451 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2625,6 +2625,10 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod) { description_form->setText(model_name); } + // Add info to log that loading is complete (purpose: separator between loading and other logs) + LLSD args; + args["MODEL_NAME"] = model_name; // Teoretically shouldn't be empty, but might be better idea to add filename here + LLFloaterModelPreview::addStringToLog("ModelLoaded", args, false, loaded_lod); } } refresh(); diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 053c482831..aeed3b4623 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -39,11 +39,11 @@ Simplifying... TBD - + Skinning disabled due to too many joints: [JOINTS], maximum: [MAX] Rigged to unrecognized joint name [NAME] Skinning disabled due to [COUNT] unknown joints - + Model [MODEL_NAME] loaded