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/llappviewer.cpp | |
| parent | 6711e6584aa0aa5f17f76a557524725857fbf2ba (diff) | |
| parent | da0b5fe998434a935027b5e7cca2b70b895f0673 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b7afea89ce..b297ce820a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3027,8 +3027,8 @@ void LLAppViewer::writeSystemInfo() gDebugInfo["OSInfo"] = getOSInfo().getOSStringSimple(); // The user is not logged on yet, but record the current grid choice login url - // which may have been the intended grid. This can b - gDebugInfo["GridName"] = LLGridManager::getInstance()->getGridLabel(); + // which may have been the intended grid. + gDebugInfo["GridName"] = LLGridManager::getInstance()->getGridId(); // *FIX:Mani - move this down in llappviewerwin32 #ifdef LL_WINDOWS @@ -5058,7 +5058,7 @@ void LLAppViewer::launchUpdater() #endif // *TODO change userserver to be grid on both viewer and sim, since // userserver no longer exists. - query_map["userserver"] = LLGridManager::getInstance()->getGridLabel(); + query_map["userserver"] = LLGridManager::getInstance()->getGridId(); query_map["channel"] = LLVersionInfo::getChannel(); // *TODO constantize this guy // *NOTE: This URL is also used in win_setup/lldownloader.cpp |