diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-21 15:00:07 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-21 15:00:07 +0300 |
| commit | bcdb1536c1248f41feb51542e523ca7c763542ef (patch) | |
| tree | 982577300d755e8db0a8f45af1c2ec09b15f90d4 /indra/newview/llviewernetwork.cpp | |
| parent | 6dc2f859fe60feffa92f1377cff8888ba0b47341 (diff) | |
| parent | 9eaf8eaf729193542f2b766eba5cbc624806a53f (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 |