Merge branch 'master' into DRTVWR-486

1 files changed, 13 insertions, 2 deletions

diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
index d485203fa1..168880dc12 100644
--- a/indra/viewer_components/login/lllogin.cpp
+++ b/indra/viewer_components/login/lllogin.cpp
@@ -284,14 +284,25 @@ void LLLogin::Impl::loginCoro(std::string uri, LLSD login_params)
 
         // If we don't recognize status at all, trouble
         if (! (status == "CURLError"
+               || status == "BadType"
                || status == "XMLRPCError"
                || status == "OtherError"))
         {
-            LL_ERRS("LLLogin") << "Unexpected status from " << xmlrpcPump.getName() << " pump: "
-                               << mAuthResponse << LL_ENDL;
+            LL_ERRS("LLLogin") << "Unexpected status " << status
+                               << " from " << xmlrpcPump.getName()
+                               << " pump: " << mAuthResponse << LL_ENDL;
             return;
         }
 
+        if (status == "BadType")
+        {
+            // Invalid xmlrpc type
+            // Dump this response into logs
+            LL_WARNS("LLLogin") << "Failed to parse response"
+                << " from " << xmlrpcPump.getName()
+                << " pump: " << mAuthResponse << LL_ENDL;
+        }
+
         // Here status IS one of the errors tested above.
         // Tell caller this didn't work out so well.