livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7388 - --grid command line argument doesn't do anything. 

Grid selection code was looking up the grid by grid host id not grid label.
As SLE grids use their dns name as their lable, it worked there.
However, the beta grids use a short label.
meow-7.2.2
Roxie Linden 2010-05-19 18:36:51 -07:00
parent ab4b60c375
commit da09b1dde1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewernetwork.cpp
View File

@ -257,7 +257,11 @@ void LLGridManager::initialize(const std::string& grid_file)
// load a grid from the command line.
// if the actual grid name is specified from the command line,
// set it as the 'selected' grid.
mGrid = gSavedSettings.getString("CmdLineGridChoice");
std::string cmd_line_grid = gSavedSettings.getString("CmdLineGridChoice");
if(!cmd_line_grid.empty())
{
mGrid = getGridByLabel(cmd_line_grid);
}
LL_INFOS("GridManager") << "Grid Name: " << mGrid << LL_ENDL;
// If a command line login URI was passed in, so we should add the command