diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-12 21:58:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-12 21:58:52 -0400 |
| commit | d500379cea865e4a6958eee82b5615ace61036c4 (patch) | |
| tree | e1646aa036beae68d5d15371d7ea2731ad49602c /indra/newview/llstartup.cpp | |
| parent | ce563795e1f5d7493b975393bea9ec5cab90fd6a (diff) | |
PATH-735: Limit and clean up grid selection
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 0ac8c1fe39..f7d1e2a331 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -994,7 +994,7 @@ bool idle_startup() if(STATE_LOGIN_AUTH_INIT == LLStartUp::getStartupState()) { - gDebugInfo["GridName"] = LLGridManager::getInstance()->getGridLabel(); + gDebugInfo["GridName"] = LLGridManager::getInstance()->getGridId(); // Update progress status and the display loop. auth_desc = LLTrans::getString("LoginInProgress"); @@ -1158,7 +1158,6 @@ bool idle_startup() LLVoiceClient::getInstance()->userAuthorized(gUserCredential->userID(), gAgentID); // create the default proximal channel LLVoiceChannel::initClass(); - LLGridManager::getInstance()->setFavorite(); LLStartUp::setStartupState( STATE_WORLD_INIT); } else |