diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-20 11:48:47 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-20 11:48:47 -0700 |
| commit | 5e353cbf86693ad18b0c9a3f75234c1fa6378005 (patch) | |
| tree | e2eb2b4732391b332aaa84957d274a3983a2a20f /indra/newview/llviewernetwork.cpp | |
| parent | be20b12c5c225e5dbc564ba32dee87b4bf1722b5 (diff) | |
| parent | afef949533e575a8f0558ef8477eb8644d66c524 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -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 |