From f7df6f323e4746abae0a0858cb7ef56bedbb94ca Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 15 Apr 2011 21:07:29 -0700 Subject: Updated the grid manager to save names and passwords along with grid info. This commit includes the following: * Fixed missing GPL headers from hippo grid manager * Fixed grids named or "" being saved in the list * Fixed grid manager list only showing grid nicks, not grid names * Fixed grid names not settable in the grid manager * Grid manager now remembers avatar names and passwords * Usernames can now be set in the grid manager for SL (needs work) * Fixed grid manager being stuck in an updating state * Some general code cleanup --- linden/indra/newview/llviewernetwork.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linden/indra/newview/llviewernetwork.cpp') 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& uris) const // If there was no command line uri... if(uris.empty()) { - uris.push_back(gHippoGridManager->getConnectedGrid()->getLoginUri()); + uris.push_back(gHippoGridManager->getConnectedGrid()->getLoginURI()); /* // If its a known grid choice, get the uri from the table, // else try the grid name. @@ -92,7 +92,7 @@ void LLViewerLogin::getLoginURIs(std::vector& uris) const const std::string &LLViewerLogin::getGridLabel() const { - return gHippoGridManager->getConnectedGrid()->getGridNick(); + return gHippoGridManager->getConnectedGrid()->getGridName(); } const std::string &LLViewerLogin::getLoginPage() const @@ -102,7 +102,7 @@ const std::string &LLViewerLogin::getLoginPage() const const std::string &LLViewerLogin::getHelperURI() const { - return gHippoGridManager->getConnectedGrid()->getHelperUri(); + return gHippoGridManager->getConnectedGrid()->getHelperURI(); } bool LLViewerLogin::isOpenSimulator() -- cgit v1.1