summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmetricperformancetester.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-16 11:04:12 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-16 11:04:12 -0400
commit099e3b41668a8c951cf74ec585ed4192bab507db (patch)
tree5481b7cbb15e5674d552fb063227c1277bcdb78b /indra/llcommon/llmetricperformancetester.cpp
parent51bb369a39142ff5049f753099f9638ce68b95dc (diff)
parentd2c3c2f9fe197b1856e9a8ed37aeb56b77e2ff07 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llmetricperformancetester.cpp')
-rw-r--r--indra/llcommon/llmetricperformancetester.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmetricperformancetester.cpp b/indra/llcommon/llmetricperformancetester.cpp
index 1fc821d9a9..16fc365da1 100644
--- a/indra/llcommon/llmetricperformancetester.cpp
+++ b/indra/llcommon/llmetricperformancetester.cpp
@@ -40,7 +40,7 @@
LLMetricPerformanceTesterBasic::name_tester_map_t LLMetricPerformanceTesterBasic::sTesterMap ;
/*static*/
-void LLMetricPerformanceTesterBasic::cleanClass()
+void LLMetricPerformanceTesterBasic::cleanupClass()
{
for (name_tester_map_t::iterator iter = sTesterMap.begin() ; iter != sTesterMap.end() ; ++iter)
{