summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llxmlrpclistener.cpp5
-rw-r--r--indra/viewer_components/login/lllogin.cpp5
2 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp
index bae615232e..83c4592c1d 100644
--- a/indra/newview/llxmlrpclistener.cpp
+++ b/indra/newview/llxmlrpclistener.cpp
@@ -469,6 +469,11 @@ private:
current);
responses.insert(key, submap);
}
+ else if (xmlrpc_type_empty == type)
+ {
+ LL_INFOS("LLXMLRPCListener") << "Empty result for key " << key_pfx << key << LL_ENDL;
+ responses.insert(key, LLSD());
+ }
else
{
// whoops - unrecognized type
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
index d485203fa1..c2a0c46c83 100644
--- a/indra/viewer_components/login/lllogin.cpp
+++ b/indra/viewer_components/login/lllogin.cpp
@@ -287,8 +287,9 @@ void LLLogin::Impl::loginCoro(std::string uri, LLSD login_params)
|| 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;
}