summaryrefslogtreecommitdiff
path: root/indra/newview/lllogininstance.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-04-02 14:32:59 -0700
committerGraham Linden <graham@lindenlab.com>2019-04-02 14:32:59 -0700
commitb8115d43c95504afa0a15a091e3d1ab389c71366 (patch)
tree9604a0f9ab1c65894bca1239264c3e1842acd58b /indra/newview/lllogininstance.cpp
parentac2fc3029f3b9b6ba182949c29a7919f2f87eb02 (diff)
parent5cf18cb867be567bf921f0b94a78fd822e4112ad (diff)
Merge 6.1.2
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
-rw-r--r--indra/newview/lllogininstance.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 126c6be388..df040d8f13 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);
}