summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-19 14:52:44 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-19 14:52:44 -0400
commit7fbf42dec8bae638b62676c280b3f042f9458057 (patch)
tree28949f9335c16f4e814bd3607383a24ab770427f /indra/newview/tests
parentadf5b5c1efaed30dc043652b174d76c9088f4b18 (diff)
Move phase tracking to its own set of classes inside LLViewerStats - simplifies llvoavatar and allows adding such tracking to classes that live outside the avatar lifetime
Diffstat (limited to 'indra/newview/tests')
-rwxr-xr-xindra/newview/tests/llviewerassetstats_test.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/tests/llviewerassetstats_test.cpp b/indra/newview/tests/llviewerassetstats_test.cpp
index 952f0f1a6e..f8923b9868 100755
--- a/indra/newview/tests/llviewerassetstats_test.cpp
+++ b/indra/newview/tests/llviewerassetstats_test.cpp
@@ -45,12 +45,6 @@ void LLVOAvatar::getNearbyRezzedStats(std::vector<S32>& counts)
counts[2] = 1;
}
-LLViewerStats::StatsAccumulator& LLVOAvatar::getPhaseStats(const std::string& phase_name)
-{
- static std::map<std::string,LLViewerStats::StatsAccumulator> stats_map;
- return stats_map[phase_name];
-}
-
// static
std::string LLVOAvatar::rezStatusToString(S32 rez_status)
{
@@ -60,6 +54,13 @@ std::string LLVOAvatar::rezStatusToString(S32 rez_status)
return "unknown";
}
+// static
+LLViewerStats::StatsAccumulator& LLViewerStats::PhaseMap::getPhaseStats(const std::string& phase_name)
+{
+ static LLViewerStats::StatsAccumulator junk;
+ return junk;
+}
+
static const char * all_keys[] =
{
"duration",