diff options
| author | James Cook <james@lindenlab.com> | 2010-05-25 11:41:33 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-25 11:41:33 -0700 |
| commit | a91d10dc1806d1931c7f1361bfcf70df59d982d5 (patch) | |
| tree | 20f2940d888aaf71c54ff1e7834cbf79a3617216 /indra/newview/llviewernetwork.cpp | |
| parent | d6ea42984553b7adb6f26cf2ed094d32e36814d2 (diff) | |
| parent | f682c996d28c3841b6709f8fc67ba443bfcd1926 (diff) | |
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 |