diff options
| author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
| commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
| tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llviewercontrol.h | |
| parent | Second Life viewer sources 1.20.15 (diff) | |
| download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz | |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llviewercontrol.h | 6 |
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 |
| 47 | void settings_setup_listeners(); | 47 | void settings_setup_listeners(); |
| 48 | 48 | ||
| 49 | extern std::map<LLString, LLControlGroup*> gSettings; | 49 | extern std::map<std::string, LLControlGroup*> gSettings; |
| 50 | 50 | ||
| 51 | // for the graphics settings | 51 | // for the graphics settings |
| 52 | void create_graphics_group(LLControlGroup& group); | 52 | void create_graphics_group(LLControlGroup& group); |
| @@ -62,8 +62,8 @@ extern LLControlGroup gColors; | |||
| 62 | extern LLControlGroup gCrashSettings; | 62 | extern LLControlGroup gCrashSettings; |
| 63 | 63 | ||
| 64 | // Set after settings loaded | 64 | // Set after settings loaded |
| 65 | extern LLString gLastRunVersion; | 65 | extern std::string gLastRunVersion; |
| 66 | extern LLString gCurrentVersion; | 66 | extern std::string gCurrentVersion; |
| 67 | 67 | ||
| 68 | //! Helper function for LLCachedControl | 68 | //! Helper function for LLCachedControl |
| 69 | template <class T> | 69 | template <class T> |