diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-10 13:46:16 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-10 13:46:16 -0500 |
| commit | 6215fa4c136b240025851a7b1c73c284c2f399e4 (patch) | |
| tree | 4b7d56d3bf4fc7f10cc4f8734d4ae518bc389cb6 /indra/newview/llstartup.cpp | |
| parent | 6b0c1f97f4c1c24d786d2d1a0171b883d21f447b (diff) | |
| parent | 9b4d09471cca6922257a27ba9cb70498ab81fd94 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index f3d161ce1e..d8d1760c38 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -369,8 +369,6 @@ bool idle_startup() LLMemType mt1(LLMemType::MTYPE_STARTUP); const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay"); - const F32 TIMEOUT_SECONDS = 5.f; - const S32 MAX_TIMEOUT_COUNT = 3; static LLTimer timeout; static S32 timeout_count = 0; @@ -1438,9 +1436,9 @@ bool idle_startup() msg->addUUIDFast(_PREHASH_ID, gAgent.getID()); msg->sendReliable( gFirstSim, - MAX_TIMEOUT_COUNT, + gSavedSettings.getS32("UseCircuitCodeMaxRetries"), FALSE, - TIMEOUT_SECONDS, + gSavedSettings.getF32("UseCircuitCodeTimeout"), use_circuit_callback, NULL); @@ -2741,6 +2739,9 @@ void LLStartUp::postStartupState() void reset_login() { + gAgent.cleanup(); + LLWorld::getInstance()->destroyClass(); + LLStartUp::setStartupState( STATE_LOGIN_SHOW ); if ( gViewerWindow ) |