diff options
author | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
commit | 7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch) | |
tree | 99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/newview/llviewercontrol.h | |
parent | 47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff) |
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/newview/llviewercontrol.h')
-rw-r--r-- | indra/newview/llviewercontrol.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h index a6692df7fb..e86f961b3a 100644 --- a/indra/newview/llviewercontrol.h +++ b/indra/newview/llviewercontrol.h @@ -53,8 +53,7 @@ extern LLControlGroup gCrashSettings; extern LLString gLastRunVersion; extern LLString gCurrentVersion; -extern char gSettingsFileName[LL_MAX_PATH]; -extern char gPerAccountSettingsFileName[LL_MAX_PATH]; -extern const char *DEFAULT_SETTINGS_FILE; +extern LLString gSettingsFileName; +extern LLString gPerAccountSettingsFileName; #endif // LL_LLVIEWERCONTROL_H |