diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 14:30:48 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 14:30:48 -0500 |
| commit | fed5834238f554a784f4d44118a00b8da4026ca5 (patch) | |
| tree | 50ef90aa83dc3f271374132f091cb11a586a0d14 /indra/viewer_components/login/lllogin.cpp | |
| parent | 84ff7485ae161fe35963da2f35e111b685719ece (diff) | |
| parent | 657cbc3b74f0005290faf852e97d697296374566 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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")) |