From 4e7bef91a72f6b08414fa56e9516159b848f818c Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 6 Mar 2012 10:10:17 -0500 Subject: SH-2970 WIP --- indra/newview/llvoavatarself.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 22a52f8854..f14b3c2b6b 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2063,14 +2063,15 @@ LLSD LLVOAvatarSelf::metricsData() result["is_self"] = isSelf(); std::vector rez_counts; LLVOAvatar::getNearbyRezzedStats(rez_counts); - result["nearby_cloud"] = rez_counts[0]; - result["nearby_gray"] = rez_counts[1]; - result["nearby_textured"] = rez_counts[2]; - result["timer_debug_existence"] = mDebugExistenceTimer.getElapsedTimeF32(); - result["timer_ruth_debug"] = mRuthDebugTimer.getElapsedTimeF32(); - result["timer_ruth"] = mRuthTimer.getElapsedTimeF32(); - result["timer_invisible"] = mInvisibleTimer.getElapsedTimeF32(); - result["timer_fully_loaded"] = mFullyLoadedTimer.getElapsedTimeF32(); + result["nearby"] = LLSD::emptyArray(); + result["nearby"][0] = rez_counts[0]; + result["nearby"][1] = rez_counts[1]; + result["nearby"][2] = rez_counts[2]; + result["timers"]["debug_existence"] = mDebugExistenceTimer.getElapsedTimeF32(); + result["timers"]["ruth_debug"] = mRuthDebugTimer.getElapsedTimeF32(); + result["timers"]["ruth"] = mRuthTimer.getElapsedTimeF32(); + result["timers"]["invisible"] = mInvisibleTimer.getElapsedTimeF32(); + result["timers"]["fully_loaded"] = mFullyLoadedTimer.getElapsedTimeF32(); return result; } -- cgit v1.2.3