changed nearby avatar stat metrics to map instead of array

3 files changed, 13 insertions, 8 deletions

diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp
index 4928f93a51..0adefbc500 100755
--- a/indra/newview/llviewerassetstats.cpp
+++ b/indra/newview/llviewerassetstats.cpp
@@ -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);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index ea771b6d68..1537435526 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -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()
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 20f91811a3..36c2f8b0de 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -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();