Merge remote branch 'mccabe/next' into next

5 files changed, 25 insertions, 8 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 53d84dc..f3508e0 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4581,7 +4581,17 @@
       <key>Value</key>
       <string>0.0.0</string>
     </map>
-  
+    <key>LastSelectedGrid</key>
+    <map>
+      <key>Comment</key>
+      <string>Last grid selected from the grid pulldown</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
+    </map>
     <key>LastSnapshotToEmailHeight</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
index 71e3a95..9ff2d39 100644
--- a/linden/indra/newview/hippoGridManager.cpp
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -670,8 +670,10 @@ void HippoGridManager::loadFromFile()
         if (gSavedSettings.getBOOL("CheckForGridUpdates"))
                 parseUrl("http://imprudenceviewer.org/app/grids/", !mGridInfo.empty());
 
-        setDefaultGrid(gSavedSettings.getString("DefaultGrid"));
-        setCurrentGrid(gSavedSettings.getString("DefaultGrid"));
+        std::string last_grid = gSavedSettings.getString("LastSelectedGrid");
+        if (last_grid.empty()) last_grid = gSavedSettings.getString("DefaultGrid");
+        setDefaultGrid(last_grid);
+        setCurrentGrid(last_grid);
 }
 
 
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 629437d..1a17b20 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -728,7 +728,9 @@ void LLPanelLogin::addServer(const std::string& server)
         }
         else
         {
-                grids->setSimple(defaultGrid);
+                std::string last_grid = gSavedSettings.getString("LastSelectedGrid");
+                if (last_grid.empty()) last_grid = defaultGrid;
+                grids->setSimple(last_grid);
         }
 
         //LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
@@ -1185,6 +1187,9 @@ void LLPanelLogin::onSelectServer(LLUICtrl* ctrl, void*)
 
         // grid changed so show new splash screen (possibly)
         loadLoginPage();
+
+        // save grid choice to settings
+        gSavedSettings.setString("LastSelectedGrid", mCurGrid);
 }
 /*
 void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
index 8be72fc..e9f2bfd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
@@ -20,10 +20,10 @@
     Sunrise
   </string>
   <string name="sunset">
-    Midday
+    Sunset
   </string>
   <string name="noon">
-    Noon
+    Midday
   </string>
   <string name="midnight">
     Midnight
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index 4cb49a3..347e913 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -38,10 +38,10 @@
     Sunrise
   </string>
   <string name="sunset">
-    Midday
+    Sunset
   </string>
   <string name="noon">
-    Noon
+    Midday
   </string>
   <string name="midnight">
     Midnight