diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
| commit | f64a20ddcff91677b02b7688e08819cffb0989c9 (patch) | |
| tree | 707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/llviewernetwork.cpp | |
| parent | c077250ff16aeaf0ec4c036154a427c677e85eb3 (diff) | |
| parent | 17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff) | |
merge changes for storm-1016
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(); } |