livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed nearby avatar stat metrics to map instead of array

master
Brad Payne (Vir Linden) 2012-03-21 13:51:49 -04:00
parent c36acfdc83
commit 4c8c4eb28a
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerassetstats.cpp
View File

@ -346,9 +346,11 @@ LLViewerAssetStats::asLLSD(bool compact_output)
slot[mean_tag] = LLSD(F64(stats.mFPS.getMean()));
}
reg_stat[avatar_tag][avatar_nearby_tag] = LLSD::emptyArray();
for (S32 j = 0; j < stats.mAvatarRezStates.size(); ++j)
if (stats.mAvatarRezStates.size() > 2)
{
reg_stat[avatar_tag][avatar_nearby_tag].append(stats.mAvatarRezStates[j]);
reg_stat[avatar_tag][avatar_nearby_tag]["cloud"] = stats.mAvatarRezStates[0];
reg_stat[avatar_tag][avatar_nearby_tag]["gray"] = stats.mAvatarRezStates[1];
reg_stat[avatar_tag][avatar_nearby_tag]["textured"] = stats.mAvatarRezStates[2];
}
U32 grid_x(0), grid_y(0);

7
indra/newview/llvoavatar.cpp
View File

@ -981,8 +981,11 @@ void LLVOAvatar::startPhase(const std::string& phase_name)
void LLVOAvatar::stopPhase(const std::string& phase_name)
{
LLFrameTimer& timer = getPhaseTimer(phase_name);
timer.pause();
phase_map_t::iterator iter = mPhases.find(phase_name);
if (iter != mPhases.end())
{
iter->second.pause();
}
}
void LLVOAvatar::stopAllPhases()

8
indra/newview/llvoavatarself.cpp
View File

@ -2097,10 +2097,10 @@ LLSD LLVOAvatarSelf::metricsData()
result["is_self"] = isSelf();
std::vector<S32> rez_counts;
LLVOAvatar::getNearbyRezzedStats(rez_counts);
result["nearby"] = LLSD::emptyArray();
result["nearby"][0] = rez_counts[0];
result["nearby"][1] = rez_counts[1];
result["nearby"][2] = rez_counts[2];
result["nearby"] = LLSD::emptyMap();
result["nearby"]["cloud"] = rez_counts[0];
result["nearby"]["gray"] = rez_counts[1];
result["nearby"]["textured"] = rez_counts[2];
result["timers"]["debug_existence"] = mDebugExistenceTimer.getElapsedTimeF32();
result["timers"]["ruth_debug"] = mRuthDebugTimer.getElapsedTimeF32();
result["timers"]["ruth"] = mRuthTimer.getElapsedTimeF32();