diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-19 18:36:51 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-19 18:36:51 -0700 |
| commit | da09b1dde1e09cd5c43114321479da3b22df1355 (patch) | |
| tree | 0b9c5782087e15d5e945adfbfa1f495584f6c926 | |
| parent | ab4b60c375848bb5ff2e5ec9fd484892c056d8d0 (diff) | |
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.
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 7812867667..c76eee80f7 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -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 |