summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-11-09 13:12:43 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2009-11-09 13:12:43 -0800
commit2b5faa0b9cac3736b9d96a68cd13e05ee39ab7d1 (patch)
tree3bd2ad0aca9acc5cb75585446c5d77e21760c09f
parent913c29f70990493b1c66e429140eb3535f00558c (diff)
Changed SRV Request timeout to respond with an event instead of an error
-rw-r--r--indra/viewer_components/login/lllogin.cpp11
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;