summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llstartup.h')
-rw-r--r--indra/newview/llstartup.h6
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