diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-06 16:38:19 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-06 16:38:19 -0800 |
| commit | 35bb14951f686da538264db349f4bfbe045b8c82 (patch) | |
| tree | 31d37e3e67863aba03b2c6aef5abc5629a784e65 /indra/viewer_components/login/lllogin.cpp | |
| parent | 95f14d73138a4f0eb9163fdc560a0dcad9564c4c (diff) | |
| parent | e28eac929b8d26d133be5c1953cfdd0b7d0eb9e5 (diff) | |
Merge
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")) |