diff options
| author | Richard Linden <none@none> | 2011-03-01 17:16:37 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-01 17:16:37 -0800 |
| commit | 7ffd09a697a132b6b1478e74e5729167408a1f6a (patch) | |
| tree | 2f0d8cef2f91f1c17bb7d495cbc8d415ce96a72f /indra/newview/llviewernetwork.cpp | |
| parent | 876ac01791104afa9122ea0d3f6a914b5a86fd72 (diff) | |
| parent | afe9557ea922a382497f99f6341a13ce9d9b9228 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index b91e407c6d..a72dcc8885 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -31,6 +31,7 @@ #include "llviewercontrol.h" #include "llsdserialize.h" #include "llsecapi.h" +#include "lltrans.h" #include "llweb.h" @@ -504,7 +505,9 @@ void LLGridManager::setGridChoice(const std::string& grid) addGrid(grid_data); } mGrid = grid; - gSavedSettings.setString("CurrentGrid", grid); + gSavedSettings.setString("CurrentGrid", grid); + LLTrans::setDefaultArg("GRID", mGrid); + updateIsInProductionGrid(); } |