summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmetricperformancetester.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-10 10:44:21 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-10 10:44:21 -0500
commite3ed1565f8c6eeff5d87f862465038aa98576fa9 (patch)
tree4ab57c1658d589d802f1e6bb6ff3331b75b61074 /indra/llcommon/llmetricperformancetester.h
parent952c3eaaa8c78d00ef62932d46af1d8fa565e7b2 (diff)
parent76cb9a7796ffce930458aae00147f8dafa4b33fb (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/llcommon/llmetricperformancetester.h')
-rw-r--r--indra/llcommon/llmetricperformancetester.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmetricperformancetester.h b/indra/llcommon/llmetricperformancetester.h
index 925010ac96..1372f48dcf 100644
--- a/indra/llcommon/llmetricperformancetester.h
+++ b/indra/llcommon/llmetricperformancetester.h
@@ -27,7 +27,7 @@
#ifndef LL_METRICPERFORMANCETESTER_H
#define LL_METRICPERFORMANCETESTER_H
-const std::string DEFAULT_METRIC_NAME("metric");
+char const* const DEFAULT_METRIC_NAME = "metric";
/**
* @class LLMetricPerformanceTesterBasic