summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewercontrol.h')
-rw-r--r--indra/newview/llviewercontrol.h6
1 files changed, 3 insertions, 3 deletions
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