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/llviewercontrol.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llviewercontrol.h')

diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h
index 4ac544b780..954454fbd1 100644
--- a/indra/newview/llviewercontrol.h
+++ b/indra/newview/llviewercontrol.h
@@ -46,7 +46,7 @@ extern BOOL gHackGodmode;
 //setting variables are declared in this function
 void settings_setup_listeners();
 
-extern std::map<LLString, LLControlGroup*> gSettings;
+extern std::map<std::string, LLControlGroup*> gSettings;
 
 // for the graphics settings
 void create_graphics_group(LLControlGroup& group);
@@ -62,7 +62,7 @@ extern LLControlGroup gColors;
 extern LLControlGroup gCrashSettings;
 
 // Set after settings loaded
-extern LLString gLastRunVersion;
-extern LLString gCurrentVersion;
+extern std::string gLastRunVersion;
+extern std::string gCurrentVersion;
 
 #endif // LL_LLVIEWERCONTROL_H
-- 
cgit v1.2.3