diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llstartup.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llstartup.h')
| -rw-r--r-- | indra/newview/llstartup.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 6c832492c0..b5de15d983 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -36,13 +36,13 @@ // functions BOOL idle_startup(); -LLString load_password_from_disk(); +std::string load_password_from_disk(); void release_start_screen(); void login_alert_done(S32 option, void* user_data); // constants, variables, & enumerations -extern const char* SCREEN_HOME_FILENAME; -extern const char* SCREEN_LAST_FILENAME; +extern std::string SCREEN_HOME_FILENAME; +extern std::string SCREEN_LAST_FILENAME; enum EStartupState{ STATE_FIRST, // Initial startup |