From adc975ff91ab89ebb3f0035110964e9aaea308b4 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 9 Dec 2009 10:20:08 -0500 Subject: Reduce likelihood of indefinite wait in viewer integration tests. Introduce LLStartupListener to allow viewerclient-based test script to query startup state. This handles the scenario in which, by the time the test script manages to connect, the viewer already IS in STATE_STARTED. Fix ViewerSession to invoke that query before waiting for STATE_STARTED. Make that wait time out eventually to deal with "System currently logging you off, please wait 5 minutes." Timeout raises new ViewerWontLogin exception. Fix testlangs to catch ViewerWontLogin and retry a limited number of times. --- indra/newview/llstartup.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llstartup.h') 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 + 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 sStateWatcher; + static boost::scoped_ptr sListener; }; -- cgit v1.2.3