diff options
author | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
commit | 1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch) | |
tree | 326e829b4233658ba8698e06ff17267618e93a62 /indra/newview/llviewernetwork.cpp | |
parent | becc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff) | |
parent | e4a4d75104916968ce03337094b1194e0daff438 (diff) |
Merge with viewer-development
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(); } |