diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 10:08:02 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 10:08:02 -0500 |
| commit | 0f89155e295f632187704999d8ecc01f464a88d8 (patch) | |
| tree | f32b25728d34764c6d61e6a54d05858b451b6af0 /indra/viewer_components/login/lllogin.cpp | |
| parent | 6157187e5bdff889613673f11852d9c25f96bf92 (diff) | |
EXT-3934: On SRV timeout, don't fail, proceed with original URI.
Diffstat (limited to 'indra/viewer_components/login/lllogin.cpp')
| -rw-r--r-- | indra/viewer_components/login/lllogin.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp index 364088ab31..f5bda71846 100644 --- a/indra/viewer_components/login/lllogin.cpp +++ b/indra/viewer_components/login/lllogin.cpp @@ -160,8 +160,11 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential seconds_to_timeout = credentials["cfg_srv_timeout"].asReal(); } - filter.eventAfter(seconds_to_timeout, - getProgressEventLLSD("offline", "fail.login")); + // If the SRV request times out (e.g. EXT-3934), simulate response: an + // array containing our original URI. + LLSD fakeResponse(LLSD::emptyArray()); + fakeResponse.append(uri); + filter.eventAfter(seconds_to_timeout, fakeResponse); std::string srv_pump_name = "LLAres"; if(credentials.has("cfg_srv_pump")) |