diff options
| author | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
| commit | 96ef49df75c0248e4843f9a5b53f010b819d59f3 (patch) | |
| tree | 9f542fae939073bbb39464500d3fd477d1ed5fe5 /indra/viewer_components/login | |
| parent | dc71cae16b9c49a1d6b4d4a888c3a574049fd087 (diff) | |
| parent | e0432f98ee515f9777604aa784d28b63d2abfe40 (diff) | |
Automated merge
Diffstat (limited to 'indra/viewer_components/login')
| -rw-r--r-- | indra/viewer_components/login/lllogin.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp index d480b63094..bdcb068200 100644 --- a/indra/viewer_components/login/lllogin.cpp +++ b/indra/viewer_components/login/lllogin.cpp @@ -271,6 +271,16 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD login_para } return; // Done! } + + /* Sometimes we end with "Started" here. Slightly slow server? + * Seems to be ok to just skip it. Otherwise we'd error out and crash in the if below. + */ + if( status == "Started") + { + LL_DEBUGS("LLLogin") << mAuthResponse << LL_ENDL; + continue; + } + // If we don't recognize status at all, trouble if (! (status == "CURLError" || status == "XMLRPCError" |