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/llappviewer.cpp | |
| parent | ce563795e1f5d7493b975393bea9ec5cab90fd6a (diff) | |
PATH-735: Limit and clean up grid selection
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 1174d108d2..8e9e3d8ad8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3023,8 +3023,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 @@ -5054,7 +5054,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 |