aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewernetwork.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewernetwork.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 1cfe665..0c39e15 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -75,7 +75,7 @@ void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const
75 // If there was no command line uri... 75 // If there was no command line uri...
76 if(uris.empty()) 76 if(uris.empty())
77 { 77 {
78 uris.push_back(gHippoGridManager->getConnectedGrid()->getLoginUri()); 78 uris.push_back(gHippoGridManager->getConnectedGrid()->getLoginURI());
79 /* 79 /*
80 // If its a known grid choice, get the uri from the table, 80 // If its a known grid choice, get the uri from the table,
81 // else try the grid name. 81 // else try the grid name.
@@ -92,7 +92,7 @@ void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const
92 92
93const std::string &LLViewerLogin::getGridLabel() const 93const std::string &LLViewerLogin::getGridLabel() const
94{ 94{
95 return gHippoGridManager->getConnectedGrid()->getGridNick(); 95 return gHippoGridManager->getConnectedGrid()->getGridName();
96} 96}
97 97
98const std::string &LLViewerLogin::getLoginPage() const 98const std::string &LLViewerLogin::getLoginPage() const
@@ -102,7 +102,7 @@ const std::string &LLViewerLogin::getLoginPage() const
102 102
103const std::string &LLViewerLogin::getHelperURI() const 103const std::string &LLViewerLogin::getHelperURI() const
104{ 104{
105 return gHippoGridManager->getConnectedGrid()->getHelperUri(); 105 return gHippoGridManager->getConnectedGrid()->getHelperURI();
106} 106}
107 107
108bool LLViewerLogin::isOpenSimulator() 108bool LLViewerLogin::isOpenSimulator()