livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make CURRENT_GRID a default substitution, fixes FIRE-2935

Armin Weatherwax 2012-06-30 17:57:51 +02:00
parent ff6922ee54
commit c855c065cb
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/fsgridhandler.cpp
View File

@ -1067,7 +1067,8 @@ void LLGridManager::setGridChoice(const std::string& grid)
LL_DEBUGS("GridManager")<< "setting grid choice: " << grid << LL_ENDL;
mGrid = grid;// AW: don't set mGrid anywhere else
getGridData(mConnectedGrid);
gSavedSettings.setString("CurrentGrid", grid);
gSavedSettings.setString("CurrentGrid", grid);
LLTrans::setDefaultArg("CURRENT_GRID", getGridLabel()); //<FS:AW make CURRENT_GRID a default substitution>
updateIsInProductionGrid();
mReadyToLogin = true;
}

1
indra/newview/llappviewer.cpp
View File

@ -402,6 +402,7 @@ void init_default_trans_args()
default_trans_args.insert("SECOND_LIFE"); // World
default_trans_args.insert("APP_NAME");
default_trans_args.insert("CAPITALIZED_APP_NAME");
default_trans_args.insert("CURRENT_GRID"); //<FS:AW make CURRENT_GRID a default substitution>
default_trans_args.insert("SECOND_LIFE_GRID");
default_trans_args.insert("SUPPORT_SITE");
}

1
indra/newview/llviewernetwork.cpp
View File

@ -550,6 +550,7 @@ void LLGridManager::setGridChoice(const std::string& grid)
}
mGrid = grid;
gSavedSettings.setString("CurrentGrid", grid);
LLTrans::setDefaultArg("CURRENT_GRID", getGridLabel()); //<FS:AW make CURRENT_GRID a default substitution>
updateIsInProductionGrid();
}