diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-10 19:02:32 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-10 19:02:32 +0200 |
| commit | 3e13bc913f3e527b1a9d4f500ad038c06cdf6525 (patch) | |
| tree | 3e93416b19e77afdd834a581206ddcad99dc8a58 /indra/newview/llstartup.h | |
| parent | f11c6044562571d42c76abede6fa90db2b08493f (diff) | |
| parent | 6a59342963aaf4188d1c1b104d71c31eae027d2b (diff) | |
merge
--HG--
branch : product-engine
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; }; |