diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index 206be330515aac572bafe4be110d3810ab18d069..1a059ca9fdf288c455d12bfc6ca45ad0548479ab 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -37,6 +37,7 @@ #include "llviewercontrol.h" #include "llviewergenericmessage.h" #include "llviewerobjectlist.h" +#include "llviewerstats.h" #include "llcorehttputil.h" #include "llagent.h" @@ -626,6 +627,11 @@ void LLGLTFMaterialList::flushMaterials() { mLastUpdateKey.setNull(); } + + { + using namespace LLStatViewer; + sample(NUM_MATERIALS, mList.size()); + } } // static diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 5d936dfc90d7849be1d2e6e90bc744d134e7a921..0be9abadbb2b9eaf8e8a4277b88056ff5f69810a 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -139,6 +139,7 @@ SimMeasurement<LLUnit<F64, LLUnits::Percent> > LLTrace::SampleStatHandle<> FPS_SAMPLE("fpssample"), NUM_IMAGES("numimagesstat"), NUM_RAW_IMAGES("numrawimagesstat"), + NUM_MATERIALS("nummaterials"), NUM_OBJECTS("numobjectsstat"), NUM_ACTIVE_OBJECTS("numactiveobjectsstat"), ENABLE_VBO("enablevbo", "Vertex Buffers Enabled"), diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h index c21c06256eacde50e1a97f7f2e0c323b4598f456..4f0f4f88133906e6855ab5e1266b0899586c995a 100644 --- a/indra/newview/llviewerstats.h +++ b/indra/newview/llviewerstats.h @@ -180,6 +180,7 @@ extern LLTrace::SampleStatHandle<> FPS_SAMPLE, NUM_IMAGES, NUM_RAW_IMAGES, NUM_OBJECTS, + NUM_MATERIALS, NUM_ACTIVE_OBJECTS, ENABLE_VBO, LIGHTING_DETAIL, diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index b9ca0108b6b3c4e4a262513142ce4e7632a77baa..9ee161e611343d2d08d9598dec99f0e9ede5d929 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -133,6 +133,12 @@ label="Bound Mem" stat="glboundmemstat"/> </stat_view> + <stat_view name="material" + label="Material"> + <stat_bar name="nummaterials" + label="Count" + stat="nummaterials"/> + </stat_view> <stat_view name="memory" label="Memory Usage"> <stat_bar name="LLTrace"