summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-05-26 17:25:26 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-05-26 17:25:26 -0400
commit7a7a0f0c1bd134fa23d734d672ef44a763a9f228 (patch)
treea5ae59a9bfd706dd202e038d196d64c8ddb33e37 /indra/viewer_components
parentd64babaeebf301232b812e2be5461d6a32f5491f (diff)
EXP-772: If URIs returned by SRV fail, fall back on original URI.
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/login/lllogin.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
index 651d803e0d..d480b63094 100644
--- a/indra/viewer_components/login/lllogin.cpp
+++ b/indra/viewer_components/login/lllogin.cpp
@@ -178,6 +178,8 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD login_para
request["uri"] = uri;
request["reply"] = replyPump.getName();
rewrittenURIs = postAndWait(self, request, srv_pump_name, filter);
+ // EXP-772: If rewrittenURIs fail, try original URI as a fallback.
+ rewrittenURIs.append(uri);
} // we no longer need the filter
LLEventPump& xmlrpcPump(LLEventPumps::instance().obtain("LLXMLRPCTransaction"));