diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-12-09 10:22:40 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-12-09 10:22:40 -0500 |
| commit | 2c0cea901712ffad012356278d72e3c3d844e5bc (patch) | |
| tree | db84a9d9c3bcd0da5348f34e8886063449846f3a /indra/newview/llstartup.h | |
| parent | b93fb9f31954b4851a13bd3070661537f9359b00 (diff) | |
| parent | adc975ff91ab89ebb3f0035110964e9aaea308b4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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; }; |