diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:18 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:18 -0800 |
| commit | b34b82f7fea702b7cb4309195314c45fd3d2e630 (patch) | |
| tree | 8af0d2b7f2670902d9b3d7cf878081ffd7aacab7 /indra/viewer_components | |
| parent | 06ba4927aa8d288b843ed1380132c14938708707 (diff) | |
| parent | dc5db676efd340bccd2c6f376c0bcba77e0507c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
Diffstat (limited to 'indra/viewer_components')
| -rw-r--r-- | indra/viewer_components/login/lllogin.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp index 7a30315b9a..ea1e3ff3f9 100644 --- a/indra/viewer_components/login/lllogin.cpp +++ b/indra/viewer_components/login/lllogin.cpp @@ -141,9 +141,14 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential LL_INFOS("LLLogin") << "Requesting SRV record from " << uri << LL_ENDL; // *NOTE:Mani - Completely arbitrary timeout value for SRV request. - filter.errorAfter(5, "SRV Request timed out!"); - - // Make request + // filter.errorAfter(5, "SRV Request timed out!"); + + // + F32 seconds_to_timeout = 5.0f; + filter.actionAfter(seconds_to_timeout, + sendProgressEvent("offline", "fail.login", LLSD())); + + // Make request LLSD request; request["op"] = "rewriteURI"; request["uri"] = uri; |