diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-07 16:20:27 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-07 16:20:27 -0500 |
| commit | 6abd41831a4cae5d757aa44675731d1fd48d64b1 (patch) | |
| tree | 6fc9de74e865a8337823b317a87b7c132bca0c7a /indra/viewer_components/login/lllogin.cpp | |
| parent | bb04795eeb222e5396e24e79ac1f77b155bd4622 (diff) | |
| parent | 6b8ed2ae6f92d6f9559cbc86699b9ca3197f2e81 (diff) | |
automated merge viewer2.0->viewer2.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")) |