aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewercontrol.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewercontrol.h')
-rw-r--r--linden/indra/newview/llviewercontrol.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index 2475984..7892905 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -46,7 +46,7 @@ extern BOOL gHackGodmode;
46//setting variables are declared in this function 46//setting variables are declared in this function
47void settings_setup_listeners(); 47void settings_setup_listeners();
48 48
49extern std::map<LLString, LLControlGroup*> gSettings; 49extern std::map<std::string, LLControlGroup*> gSettings;
50 50
51// for the graphics settings 51// for the graphics settings
52void create_graphics_group(LLControlGroup& group); 52void create_graphics_group(LLControlGroup& group);
@@ -62,8 +62,8 @@ extern LLControlGroup gColors;
62extern LLControlGroup gCrashSettings; 62extern LLControlGroup gCrashSettings;
63 63
64// Set after settings loaded 64// Set after settings loaded
65extern LLString gLastRunVersion; 65extern std::string gLastRunVersion;
66extern LLString gCurrentVersion; 66extern std::string gCurrentVersion;
67 67
68//! Helper function for LLCachedControl 68//! Helper function for LLCachedControl
69template <class T> 69template <class T>