From 25c10ed028da5c547b11f1f461916897272b0e6d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 26 Jun 2008 00:39:00 +0000
Subject: QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
 dataserver-is-deprecated

---
 indra/newview/llviewerthrottle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp
index c23a74c533..28b3834de4 100644
--- a/indra/newview/llviewerthrottle.cpp
+++ b/indra/newview/llviewerthrottle.cpp
@@ -58,7 +58,7 @@ const F32 DYNAMIC_UPDATE_DURATION = 5.0f; // seconds
 LLViewerThrottle gViewerThrottle;
 
 // static
-const char *LLViewerThrottle::sNames[TC_EOF] = {
+const std:: string LLViewerThrottle::sNames[TC_EOF] = {
 							"Resend",
 							"Land",
 							"Wind",
-- 
cgit v1.2.3