diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewerstats.cpp | 8 | ||||
| -rwxr-xr-x | indra/newview/llviewerstats.h | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 963d2ebb81..03cc9b12e3 100755 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -149,9 +149,7 @@ LLTrace::Measurement<> NUM_IMAGES("numimagesstat"), LLTrace::Measurement<LLTrace::Meters> AGENT_POSITION_SNAP("agentpositionsnap", "agent position corrections"); -LLTrace::Measurement<LLTrace::Bytes> SIM_UNACKED_BYTES("simtotalunackedbytes"), - SIM_PHYSICS_MEM("physicsmemoryallocated"), - GL_TEX_MEM("gltexmemstat"), +LLTrace::Measurement<LLTrace::Bytes> GL_TEX_MEM("gltexmemstat"), GL_BOUND_MEM("glboundmemstat"), RAW_MEM("rawmemstat"), FORMATTED_MEM("formattedmemstat"), @@ -174,6 +172,10 @@ SimMeasurement<LLTrace::Milliseconds> SIM_FRAME_TIME("simframemsec", "", LL_SIM_ SIM_SLEEP_TIME("simsleepmsec", "", LL_SIM_STAT_SIMSLEEPTIME), SIM_PUMP_IO_TIME("simpumpiomsec", "", LL_SIM_STAT_IOPUMPTIME); +SimMeasurement<LLTrace::Bytes> SIM_UNACKED_BYTES("simtotalunackedbytes", "", LL_SIM_STAT_TOTAL_UNACKED_BYTES), + SIM_PHYSICS_MEM("physicsmemoryallocated", "", LL_SIM_STAT_SIMPHYSICSMEMORY); + + LLTrace::Measurement<LLTrace::Milliseconds> FRAMETIME_JITTER("frametimejitter", "Average delta between successive frame times"), FRAMETIME_SLEW("frametimeslew", "Average delta between frame time and mean"), LOGIN_SECONDS("loginseconds", "Time between LoginRequest and LoginReply"), diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h index 06f65b2cdd..78c4b89f71 100755 --- a/indra/newview/llviewerstats.h +++ b/indra/newview/llviewerstats.h @@ -147,10 +147,8 @@ extern LLTrace::Measurement<> NUM_IMAGES, extern LLTrace::Measurement<LLTrace::Meters> AGENT_POSITION_SNAP; -extern LLTrace::Measurement<LLTrace::Bytes> SIM_UNACKED_BYTES, - DELTA_BANDWIDTH, +extern LLTrace::Measurement<LLTrace::Bytes> DELTA_BANDWIDTH, MAX_BANDWIDTH, - SIM_PHYSICS_MEM, GL_TEX_MEM, GL_BOUND_MEM, RAW_MEM, @@ -171,6 +169,9 @@ extern SimMeasurement<LLTrace::Milliseconds> SIM_FRAME_TIME, SIM_SLEEP_TIME, SIM_PUMP_IO_TIME; +extern SimMeasurement<LLTrace::Bytes> SIM_UNACKED_BYTES, + SIM_PHYSICS_MEM; + extern LLTrace::Measurement<LLTrace::Milliseconds> FRAMETIME_JITTER, FRAMETIME_SLEW, |