STORM-2082 Revert name of Reset button from Undo back to Reset. Hopefully this will be renamed Recommended Settings.

Display a test icon (artwork needed) in the pulldown panel

5 files changed, 8 insertions, 30 deletions

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 7b9c4c3035..7b252ebd4f 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -342,7 +342,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.LogPath",				boost::bind(&LLFloaterPreference::onClickLogPath, this));
 	mCommitCallbackRegistrar.add("Pref.HardwareSettings",		boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this));
 	mCommitCallbackRegistrar.add("Pref.HardwareDefaults",		boost::bind(&LLFloaterPreference::setHardwareDefaults, this));
-	mCommitCallbackRegistrar.add("Pref.Recommended",			boost::bind(&LLFloaterPreference::setRecommended, this));
 	mCommitCallbackRegistrar.add("Pref.VertexShaderEnable",		boost::bind(&LLFloaterPreference::onVertexShaderEnable, this));
 	mCommitCallbackRegistrar.add("Pref.WindowedMod",			boost::bind(&LLFloaterPreference::onCommitWindowedMode, this));
 	mCommitCallbackRegistrar.add("Pref.UpdateSliderText",		boost::bind(&LLFloaterPreference::refreshUI,this));
@@ -798,13 +797,6 @@ void LLFloaterPreference::setHardwareDefaults()
 		if (panel)
 			panel->setHardwareDefaults();
 	}
-}
-
-void LLFloaterPreference::setRecommended()
-{
-	LLFeatureManager::getInstance()->applyRecommendedSettings();
-
-	refreshEnabledGraphics();
 
 	LLPresetsManager::getInstance()->savePreset(PRESETS_GRAPHIC, PRESETS_DEFAULT);
 }
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp
index 093b5caad9..1918623cab 100644
--- a/indra/newview/llpanelpresetspulldown.cpp
+++ b/indra/newview/llpanelpresetspulldown.cpp
@@ -89,8 +89,9 @@ void LLPanelPresetsPulldown::populatePanel()
 
 			if (name == gSavedSettings.getString("PresetGraphicActive"))
 			{
-				row["columns"][1]["column"] = "active_name";
-				row["columns"][1]["value"] = "X";
+				row["columns"][1]["column"] = "icon";
+				row["columns"][1]["type"] = "icon";
+				row["columns"][1]["value"] = "Inv_Landmark";
 			}
 
 			scroll->addElement(row);
diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h
index 1bac2c65e1..d7d84b5746 100644
--- a/indra/newview/llpresetsmanager.h
+++ b/indra/newview/llpresetsmanager.h
@@ -64,7 +64,6 @@ public:
 
 	preset_name_list_t mPresetNames;
 
-//protected:
 	LLPresetsManager();
 	~LLPresetsManager();
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 6df4a4f2ea..24f3dd803f 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -37,7 +37,7 @@
   <button
     follows="top|left"
     height="23"
-    label="SaveAs..."
+    label="Save As..."
     layout="topleft"
     left_pad="5"
     name="PrefSaveButton"
@@ -949,7 +949,7 @@
     <button
       follows="left|bottom"
       height="23"
-      label="Undo"
+      label="Recommended Settings"
       layout="topleft"
       left="10"
       name="Defaults"
@@ -959,18 +959,6 @@
         function="Pref.HardwareDefaults" />
     </button>
     <button
-      follows="left|bottom"
-      height="23"
-      label="Recommended Settings"
-      layout="topleft"
-      left_pad="5"
-      name="Recommended"
-      top="310"
-      width="190">
-      <button.commit_callback
-        function="Pref.Recommended" />
-    </button>
-    <button
       follows="right|bottom"
       height="23"
       label="Hardware..."
diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
index 652d85656c..fdcbce05d2 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -38,12 +38,10 @@
     left_delta="0"
     name="preset_list">
     <scroll_list.columns
-      width="10"
-      label="Active"
-      name="active_name" />
+      name="icon"
+      width="16" />
     <scroll_list.columns
-      width="200"
-      label="Preset Name"
+      relative_width="1"
       name="preset_name" />
       <scroll_list.commit_callback
       function="Presets.RowClick" />