From 7c14e354aedf5de21a3255a467750a09f18e33eb Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 2 Apr 2012 17:26:38 -0400
Subject: SH-3064 WIP - centralized logic for mapping rez status S32 values to
 strings

---
 indra/newview/llvoavatarself.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llvoavatarself.cpp')

diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 5eb0cefb40..96f9ff39dd 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -2128,14 +2128,16 @@ LLSD LLVOAvatarSelf::metricsData()
 	// runway - add region info
 	LLSD result;
 	result["id"] = getID();
-	result["rez_status"] = getRezzedStatus();
+	result["rez_status"] = LLVOAvatar::rezStatusToString(getRezzedStatus());
 	result["is_self"] = isSelf();
 	std::vector<S32> rez_counts;
 	LLVOAvatar::getNearbyRezzedStats(rez_counts);
 	result["nearby"] = LLSD::emptyMap();
-	result["nearby"]["cloud"] = rez_counts[0];
-	result["nearby"]["gray"] = rez_counts[1];
-	result["nearby"]["textured"] = rez_counts[2];
+	for (S32 i=0; i<rez_counts.size(); ++i)
+	{
+		std::string rez_status_name = LLVOAvatar::rezStatusToString(i);
+		result["nearby"][rez_status_name] = rez_counts[i];
+	}
 	result["timers"]["debug_existence"] = mDebugExistenceTimer.getElapsedTimeF32();
 	result["timers"]["ruth_debug"] = mRuthDebugTimer.getElapsedTimeF32();
 	result["timers"]["ruth"] = mRuthTimer.getElapsedTimeF32();
-- 
cgit v1.2.3