diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 16:08:10 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 16:08:10 -0800 |
| commit | d7b55d0fa7f7f00a3811e62a9874999e9e0d0a8a (patch) | |
| tree | 27e0077e9366389bd92397f05bf8ea35203bc58e /indra/viewer_components | |
| parent | b10b7833ee160fa05a70922bffc191829bf0fb21 (diff) | |
| parent | be210914f4e9081f021cc1ad3b671765aba79b61 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/viewer_components')
| -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" |