summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-06-08 14:53:00 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-06-08 14:53:00 -0700
commit484a4733b7b361d87c6092f4f399951e84c2aacd (patch)
tree3031f4f041ffbe87f57d3a58e8ecf3bc988f439b /indra/viewer_components
parent3dfb4944ed916f9a251078a2614a854b9de0315d (diff)
parent68a7c4cb83aca58e6ad9162be9e5022d6f801eac (diff)
Merge latest from lindenlab/viewer-development/
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"));