diff options
| author | James Cook <james@lindenlab.com> | 2009-12-09 13:42:07 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-09 13:42:07 -0800 |
| commit | 7466aa198a7707f2acadacfb6709bed8351fff96 (patch) | |
| tree | 080671ab4d66607d0071e777993f1cb0c6356ec8 /indra/newview/llstartup.h | |
| parent | 1c0b5d4435e30dbfa5865ad212b3ca2a391d43ee (diff) | |
| parent | 6260ce6a9210192963a77e5b1f44b0d2c2c86591 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llstartup.h')
| -rw-r--r-- | indra/newview/llstartup.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 7f869d014f..ab11b42e74 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -33,7 +33,11 @@ #ifndef LL_LLSTARTUP_H #define LL_LLSTARTUP_H +#include <boost/scoped_ptr.hpp> + class LLViewerTexture ; +class LLEventPump; +class LLStartupListener; // functions bool idle_startup(); @@ -113,9 +117,13 @@ public: // *HACK: On startup, if we were passed a secondlife://app/do/foo // command URL, store it for later processing. + static void postStartupState(); + private: static std::string startupStateToString(EStartupState state); static EStartupState gStartupState; // Do not set directly, use LLStartup::setStartupState + static boost::scoped_ptr<LLEventPump> sStateWatcher; + static boost::scoped_ptr<LLStartupListener> sListener; }; |