From 7f50e28b0f3905f95299f7d5d63e0fd82e103bed Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 23 Jan 2007 19:12:31 +0000 Subject: merge -r 56842:57026 maintenance. --- indra/newview/llviewercontrol.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llviewercontrol.h') 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 -- cgit v1.2.3