diff options
| author | prep <prep@lindenlab.com> | 2012-06-19 15:11:13 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-19 15:11:13 -0400 |
| commit | c06d46b56788cccc778682cbd7cc37cbbca7b7cc (patch) | |
| tree | 72f4da2ec09b31aae338b866f69dd4ea34968fb1 /indra/newview/llstartup.cpp | |
| parent | 6711e6584aa0aa5f17f76a557524725857fbf2ba (diff) | |
| parent | da0b5fe998434a935027b5e7cca2b70b895f0673 (diff) | |
merge
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 3b8be3cc4f..b995a45a75 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -995,7 +995,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"); @@ -1159,7 +1159,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 |