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.cpp | |
| parent | 47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff) | |
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index c0de0c872a..ea26802152 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -38,8 +38,8 @@ LLControlGroup gCrashSettings; // saved at end of session LLString gLastRunVersion; LLString gCurrentVersion; -char gSettingsFileName[LL_MAX_PATH]; -char gPerAccountSettingsFileName[LL_MAX_PATH] = ""; +LLString gSettingsFileName; +LLString gPerAccountSettingsFileName; LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater("Configuration Editor") { |