Skip to content
Snippets Groups Projects
Commit 054e023b authored by Richard Linden's avatar Richard Linden
Browse files

merge

parents 568496eb df25093a
No related branches found
No related tags found
No related merge requests found
......@@ -304,7 +304,12 @@ void LLGridManager::initialize(const std::string& grid_file)
addGrid(grid);
}
gSavedSettings.getControl("CurrentGrid")->getSignal()->connect(boost::bind(&LLGridManager::updateIsInProductionGrid, this));
LLControlVariablePtr grid_control = gSavedSettings.getControl("CurrentGrid");
if (grid_control.notNull())
{
grid_control->getSignal()->connect(boost::bind(&LLGridManager::updateIsInProductionGrid, this));
}
// since above only triggers on changes, trigger the callback manually to initialize state
updateIsInProductionGrid();
......@@ -499,7 +504,8 @@ void LLGridManager::setGridChoice(const std::string& grid)
addGrid(grid_data);
}
mGrid = grid;
gSavedSettings.setString("CurrentGrid", grid);
gSavedSettings.setString("CurrentGrid", grid);
updateIsInProductionGrid();
}
std::string LLGridManager::getGridByLabel( const std::string &grid_label, bool case_sensitive)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment