diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:13 -0400 |
| commit | 8e0ea2fb7271b6d559ec751d47eb8b2992d4611d (patch) | |
| tree | 0368edab036f87a93a21bcd0fdd635dd749d6fc0 /indra/newview/llviewernetwork.cpp | |
| parent | 2453ccbd3ee10a4f845e98fb51aac6c1e4bca5a5 (diff) | |
| parent | f122d0939060fd597820a71d85a5c0d839bcff5d (diff) | |
merge changes for storm-659
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index b91e407c6d..a59afdc28a 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,8 @@ void LLGridManager::setGridChoice(const std::string& grid) addGrid(grid_data); } mGrid = grid; - gSavedSettings.setString("CurrentGrid", grid); + gSavedSettings.setString("CurrentGrid", grid); + updateIsInProductionGrid(); } |