summaryrefslogtreecommitdiff
path: root/indra/newview/llviewernetwork.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-03-21 10:24:07 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-03-21 10:24:07 -0700
commit31e16be0daa10e6d66b133c308130524a7a0d881 (patch)
treec44a007bc039e07e8ff938898d56a0534347750b /indra/newview/llviewernetwork.cpp
parent15404a3c5d50f5f106f5bc443d16e172c54e3e0f (diff)
parentdf63c6931e81c034887611711095e3134b9a7318 (diff)
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
-rw-r--r--indra/newview/llviewernetwork.cpp4
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();
}