diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-30 20:04:25 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-30 20:06:34 +0300 |
| commit | aaddcc0b704f28555fbd4a1f6068f44242966295 (patch) | |
| tree | 4969c072113f435fbb5725dc48c89e2b4365cb58 /indra/newview | |
| parent | acb6e12135452d8d4e53a9a61e1fb50cdeec2469 (diff) | |
SL-307 A separator to see where model loading logs ends and other state starts
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 4 | ||||
| -rw-r--r-- | 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 @@ <string name="simplifying">Simplifying...</string> <string name="tbd">TBD</string> - <!-- Warnings from model loader--> + <!-- Warnings and info from model loader--> <string name="TooManyJoint">Skinning disabled due to too many joints: [JOINTS], maximum: [MAX]</string> <string name="UnrecognizedJoint">Rigged to unrecognized joint name [NAME]</string> <string name="UnknownJoints">Skinning disabled due to [COUNT] unknown joints</string> - + <string name="ModelLoaded">Model [MODEL_NAME] loaded</string> <panel follows="top|left" |