aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llstartup.h')
-rw-r--r--linden/indra/newview/llstartup.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index fe347e9..28469d6 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -87,7 +87,10 @@ public:
87 // Always use this to set gStartupState so changes are logged 87 // Always use this to set gStartupState so changes are logged
88 static void setStartupState( EStartupState state ); 88 static void setStartupState( EStartupState state );
89 static EStartupState getStartupState() { return gStartupState; }; 89 static EStartupState getStartupState() { return gStartupState; };
90 static std::string getStartupStateString() { return startupStateToString(gStartupState); }; 90 static void resetLogin();
91
92 static void setStartedOnce(bool started);
93 static bool getStartedOnce() { return mStartedOnce; };
91 94
92 static void multimediaInit(); 95 static void multimediaInit();
93 // Initialize LLViewerMedia multimedia engine. 96 // Initialize LLViewerMedia multimedia engine.
@@ -114,8 +117,12 @@ public:
114 static std::string sSLURLCommand; 117 static std::string sSLURLCommand;
115 // *HACK: On startup, if we were passed a secondlife://app/do/foo 118 // *HACK: On startup, if we were passed a secondlife://app/do/foo
116 // command URL, store it for later processing. 119 // command URL, store it for later processing.
120 static bool shouldAutoLogin() { return mShouldAutoLogin; };
121 static void setShouldAutoLogin(bool value) { mShouldAutoLogin = value; };
117 122
118private: 123private:
124 static bool mStartedOnce;
125 static bool mShouldAutoLogin;
119 static std::string startupStateToString(EStartupState state); 126 static std::string startupStateToString(EStartupState state);
120 static EStartupState gStartupState; // Do not set directly, use LLStartup::setStartupState 127 static EStartupState gStartupState; // Do not set directly, use LLStartup::setStartupState
121}; 128};