svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release

Backport patches and translations from RC branch

1 files changed, 15 insertions, 2 deletions

diff --git a/indra/newview/llsrv.cpp b/indra/newview/llsrv.cpp
index 150fcb1583..7271513852 100644
--- a/indra/newview/llsrv.cpp
+++ b/indra/newview/llsrv.cpp
@@ -51,6 +51,19 @@ std::vector<std::string> LLSRV::rewriteURI(const std::string& uri)
 	LLPointer<Responder> resp = new Responder;
 
 	gAres->rewriteURI(uri, resp);
-	gAres->processAll();
-	return resp->mUris;
+ 	gAres->processAll();
+
+	// It's been observed in deployment that c-ares can return control
+	// to us without firing all of our callbacks, in which case the
+	// returned vector will be empty, instead of a singleton as we
+	// might wish.
+
+	if (!resp->mUris.empty())
+	{
+		return resp->mUris;
+	}
+
+	std::vector<std::string> uris;
+	uris.push_back(uri);
+	return uris;
 }