From 27679824ff756279f035c4c7f11fe7dfacc25754 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 29 Jun 2018 00:16:32 +0100
Subject: Handle grids.xml w/ single entry instead of an array.

Fix crash when no login URIs are found for a given grid
(does not happen after fixing above, but should not crash either).
---
 indra/newview/lllogininstance.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/lllogininstance.cpp')

diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index bc93fa2c20..deef3dbce7 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -113,6 +113,11 @@ void LLLoginInstance::connect(LLPointer<LLCredential> credentials)
 {
 	std::vector<std::string> uris;
 	LLGridManager::getInstance()->getLoginURIs(uris);
+    if (uris.size() < 1)
+    {
+        LL_WARNS() << "Failed to get login URIs during connect. No connect for you!" << LL_ENDL;
+        return;
+    }
 	connect(uris.front(), credentials);
 }
 
-- 
cgit v1.2.3