From 34a79a6ece28fbc560bde907142ecaadf95e910f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sun, 30 Nov 2014 07:15:00 -0500
Subject: STORM-2082 Implement delete floater

---
 indra/newview/llviewerfloaterreg.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llviewerfloaterreg.cpp')

diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index e19fe9ca75..03360deaee 100755
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -55,6 +55,7 @@
 #include "llfloaterconversationlog.h"
 #include "llfloaterconversationpreview.h"
 #include "llfloaterdeleteenvpreset.h"
+#include "llfloaterdeleteprefpreset.h"
 #include "llfloaterdestinations.h"
 #include "llfloaterdisplayname.h"
 #include "llfloatereditdaycycle.h"
@@ -204,6 +205,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
 	LLFloaterReg::add("conversation", "floater_conversation_log.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationLog>);
 
+	LLFloaterReg::add("delete_pref_preset", "floater_delete_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDeletePrefPreset>);
 	LLFloaterReg::add("destinations", "floater_destinations.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDestinations>);
 
 	LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>);
-- 
cgit v1.3


From 6d1296f71640c9c25affcff4e784ea5798ba2d5c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Mon, 1 Dec 2014 08:09:17 -0500
Subject: STORM-2082 Implement save floater and some code cleanup.

---
 indra/newview/CMakeLists.txt                       |  2 +
 indra/newview/llfloaterdeleteprefpreset.cpp        | 12 ++-
 indra/newview/llfloaterdeleteprefpreset.h          |  2 +-
 indra/newview/llfloaterpreference.cpp              | 25 ++++--
 indra/newview/llfloaterpreference.h                |  5 +-
 indra/newview/llfloatersaveprefpreset.cpp          | 97 ++++++++++++++++++++++
 indra/newview/llfloatersaveprefpreset.h            | 57 +++++++++++++
 indra/newview/llpresetsmanager.cpp                 | 41 ++++-----
 indra/newview/llpresetsmanager.h                   |  4 +-
 indra/newview/llviewerfloaterreg.cpp               |  2 +
 .../default/xui/en/floater_save_pref_preset.xml    | 50 +++++++++++
 .../newview/skins/default/xui/en/notifications.xml | 14 ++++
 .../default/xui/en/panel_preferences_graphics1.xml |  6 +-
 13 files changed, 274 insertions(+), 43 deletions(-)
 create mode 100644 indra/newview/llfloatersaveprefpreset.cpp
 create mode 100644 indra/newview/llfloatersaveprefpreset.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_save_pref_preset.xml

(limited to 'indra/newview/llviewerfloaterreg.cpp')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 213446ccfb..57fa11a0bf 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -279,6 +279,7 @@ set(viewer_SOURCE_FILES
     llfloaterregioninfo.cpp
     llfloaterreporter.cpp
     llfloaterregionrestarting.cpp
+    llfloatersaveprefpreset.cpp
     llfloatersceneloadstats.cpp
     llfloaterscriptdebug.cpp
     llfloaterscriptedprefs.cpp
@@ -890,6 +891,7 @@ set(viewer_HEADER_FILES
     llfloaterregioninfo.h
     llfloaterreporter.h
     llfloaterregionrestarting.h
+    llfloatersaveprefpreset.h
     llfloatersceneloadstats.h
     llfloaterscriptdebug.h
     llfloaterscriptedprefs.h
diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp
index bef5b4e3bf..74f8805d03 100644
--- a/indra/newview/llfloaterdeleteprefpreset.cpp
+++ b/indra/newview/llfloaterdeleteprefpreset.cpp
@@ -28,9 +28,11 @@
 
 #include "llfloaterdeleteprefpreset.h"
 
+#include "llpresetsmanager.h"
+
 #include "llbutton.h"
 #include "llcombobox.h"
-#include "llpresetsmanager.h"
+#include "llnotificationsutil.h"
 
 LLFloaterDeletePrefPreset::LLFloaterDeletePrefPreset(const LLSD &key)
 :	LLFloater(key)
@@ -49,7 +51,7 @@ BOOL LLFloaterDeletePrefPreset::postBuild()
 
 void LLFloaterDeletePrefPreset::onOpen(const LLSD& key)
 {
-	std::string mSubdirectory = key.asString();
+	mSubdirectory = key.asString();
 	std::string floater_title = getString(std::string("title_") + mSubdirectory);
 
 	setTitle(floater_title);
@@ -65,7 +67,11 @@ void LLFloaterDeletePrefPreset::onBtnDelete()
 	std::string name = combo->getSimple();
 
 	// Ignore return status
-	LLPresetsManager::getInstance()->deletePreset(name);
+	LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name);
+
+	LLSD args;
+	args["NAME"] = name;
+	LLNotificationsUtil::add("PresetDeleted", args);
 }
 
 void LLFloaterDeletePrefPreset::onPresetsListChange()
diff --git a/indra/newview/llfloaterdeleteprefpreset.h b/indra/newview/llfloaterdeleteprefpreset.h
index 356bc1a437..0ab3da7139 100644
--- a/indra/newview/llfloaterdeleteprefpreset.h
+++ b/indra/newview/llfloaterdeleteprefpreset.h
@@ -25,7 +25,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLFLOATERDELETPREFPRESET_H
+#ifndef LL_LLFLOATERDELETEPREFPRESET_H
 #define LL_LLFLOATERDELETEPREFPRESET_H
 
 #include "llfloater.h"
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 508d82522e..2e1e1ba318 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1883,8 +1883,9 @@ LLPanelPreference::LLPanelPreference()
 {
 	mCommitCallbackRegistrar.add("Pref.setControlFalse",	boost::bind(&LLPanelPreference::setControlFalse,this, _2));
 	mCommitCallbackRegistrar.add("Pref.updateMediaAutoPlayCheckbox",	boost::bind(&LLPanelPreference::updateMediaAutoPlayCheckbox, this, _1));
-	mCommitCallbackRegistrar.add("Pref.Preset",	boost::bind(&LLPanelPreference::onChangePreset, this));
-	mCommitCallbackRegistrar.add("Pref.PrefDelete",	boost::bind(&LLPanelPreference::onDeletePreset, this));
+	mCommitCallbackRegistrar.add("Pref.Preset",	boost::bind(&LLPanelPreference::onChangePreset, this, _2));
+	mCommitCallbackRegistrar.add("Pref.PrefDelete",	boost::bind(&LLPanelPreference::DeletePreset, this, _2));
+	mCommitCallbackRegistrar.add("Pref.PrefSave",	boost::bind(&LLPanelPreference::SavePreset, this, _2));
 }
 
 //virtual
@@ -2082,17 +2083,27 @@ void LLPanelPreference::updateMediaAutoPlayCheckbox(LLUICtrl* ctrl)
 	}
 }
 
-void LLPanelPreference::onDeletePreset()
+void LLPanelPreference::DeletePreset(const LLSD& user_data)
 {
-	LLFloaterReg::showInstance("delete_pref_preset", PRESETS_GRAPHIC);
+	std::string subdirectory = user_data.asString();
+	LLFloaterReg::showInstance("delete_pref_preset", subdirectory);
 }
 
-void LLPanelPreference::onChangePreset()
+void LLPanelPreference::SavePreset(const LLSD& user_data)
 {
-	LLComboBox* combo = getChild<LLComboBox>("graphic_preset_combo");
+	std::string subdirectory = user_data.asString();
+	LLFloaterReg::showInstance("save_pref_preset", subdirectory);
+}
+
+void LLPanelPreference::onChangePreset(const LLSD& user_data)
+{
+	std::string subdirectory = user_data.asString();
+
+	LLComboBox* combo = getChild<LLComboBox>(subdirectory + "_preset_combo");
 	std::string name = combo->getSimple();
 
-	LLPresetsManager::getInstance()->loadPreset(name);
+
+	LLPresetsManager::getInstance()->loadPreset(subdirectory, name);
 	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
 	if (instance)
 	{
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index be228c8625..5452dc6442 100755
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -221,8 +221,9 @@ public:
 	// cancel() can restore them.
 	virtual void saveSettings();
 
-	void onDeletePreset();
-	void onChangePreset();
+	void onChangePreset(const LLSD& user_data);
+	void DeletePreset(const LLSD& user_data);
+	void SavePreset(const LLSD& user_data);
 
 	class Updater;
 
diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp
new file mode 100644
index 0000000000..16d77c0750
--- /dev/null
+++ b/indra/newview/llfloatersaveprefpreset.cpp
@@ -0,0 +1,97 @@
+/** 
+ * @file llfloatersaveprefpreset.cpp
+ * @brief Floater to save a graphics / camera preset
+ *
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2014, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatersaveprefpreset.h"
+
+#include "llbutton.h"
+#include "llcombobox.h"
+#include "llnotificationsutil.h"
+#include "llpresetsmanager.h"
+
+LLFloaterSavePrefPreset::LLFloaterSavePrefPreset(const LLSD &key)
+:	LLFloater(key)
+{
+}
+
+// virtual
+BOOL LLFloaterSavePrefPreset::postBuild()
+{
+	getChild<LLComboBox>("preset_combo")->setTextEntryCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
+	getChild<LLComboBox>("preset_combo")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
+	getChild<LLButton>("save")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnSave, this));
+	getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnCancel, this));
+
+	LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetsListChange, this));
+
+	mSaveButton = getChild<LLButton>("save");
+	mPresetCombo = getChild<LLComboBox>("preset_combo");
+
+	return TRUE;
+}
+
+void LLFloaterSavePrefPreset::onPresetNameEdited()
+{
+	// Disable saving a preset having empty name.
+	std::string name = mPresetCombo->getSimple();
+
+	mSaveButton->setEnabled(!name.empty());
+}
+
+void LLFloaterSavePrefPreset::onOpen(const LLSD& key)
+{
+	mSubdirectory = key.asString();
+
+	std::string floater_title = getString(std::string("title_") + mSubdirectory);
+
+	setTitle(floater_title);
+
+	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo);
+
+	onPresetNameEdited();
+}
+
+void LLFloaterSavePrefPreset::onBtnSave()
+{
+	std::string name = mPresetCombo->getSimple();
+
+	LLPresetsManager::getInstance()->savePreset(mSubdirectory, name);
+
+	LLSD args;
+	args["NAME"] = name;
+	LLNotificationsUtil::add("PresetSaved", args);
+}
+
+void LLFloaterSavePrefPreset::onPresetsListChange()
+{
+	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo);
+}
+
+void LLFloaterSavePrefPreset::onBtnCancel()
+{
+	closeFloater();
+}
diff --git a/indra/newview/llfloatersaveprefpreset.h b/indra/newview/llfloatersaveprefpreset.h
new file mode 100644
index 0000000000..09a87b8c62
--- /dev/null
+++ b/indra/newview/llfloatersaveprefpreset.h
@@ -0,0 +1,57 @@
+/** 
+ * @file llfloatersaveprefpreset.h
+ * @brief Floater to save a graphics / camera preset
+
+ *
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2014, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERSAVEPREFPRESET_H
+#define LL_LLFLOATERSAVEPREFPRESET_H
+
+#include "llfloater.h"
+
+class LLComboBox;
+
+class LLFloaterSavePrefPreset : public LLFloater
+{
+
+public:
+	LLFloaterSavePrefPreset(const LLSD &key);
+
+	/*virtual*/	BOOL	postBuild();
+	/*virtual*/ void	onOpen(const LLSD& key);
+
+	void onBtnSave();
+	void onBtnCancel();
+
+private:
+	LLComboBox*		mPresetCombo;
+	LLButton*		mSaveButton;
+
+	void onPresetsListChange();
+	void onPresetNameEdited();
+
+	std::string mSubdirectory;
+};
+
+#endif // LL_LLFLOATERSAVEPREFPRESET_H
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 6e00a90ae5..f6f2275da9 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -165,7 +165,7 @@ void LLPresetsManager::savePreset(const std::string& subdirectory, const std::st
 		paramsData[ctrl_name]["Value"] = value;
 	}
 
-	std::string pathName(getPresetsDir(subdirectory) + "\\" + LLURI::escape(name) + ".xml");
+	std::string pathName(getPresetsDir(subdirectory) + gDirUtilp->getDirDelimiter() + LLURI::escape(name) + ".xml");
 
 	// write to file
 	llofstream presetsXML(pathName);
@@ -188,46 +188,35 @@ void LLPresetsManager::setPresetNamesInComboBox(const std::string& subdirectory,
 		std::list<std::string> preset_names;
 		loadPresetNamesFromDir(presets_dir, preset_names);
 
-		combo->setLabel(LLTrans::getString("preset_combo_label"));
-
-		for (std::list<std::string>::const_iterator it = preset_names.begin(); it != preset_names.end(); ++it)
+		if (preset_names.begin() != preset_names.end())
 		{
-			const std::string& name = *it;
-			combo->add(name, LLSD().with(0, name));
+			for (std::list<std::string>::const_iterator it = preset_names.begin(); it != preset_names.end(); ++it)
+			{
+				const std::string& name = *it;
+				combo->add(name, LLSD().with(0, name));
+			}
+		}
+		else
+		{
+			combo->setLabel(LLTrans::getString("preset_combo_label"));
 		}
-	}
-	else
-	{
-		LL_WARNS() << "Could not obtain graphic presets path" << LL_ENDL;
 	}
 }
 
-void LLPresetsManager::loadPreset(const std::string& name)
+void LLPresetsManager::loadPreset(const std::string& subdirectory, const std::string& name)
 {
-	std::string full_path(getPresetsDir(PRESETS_GRAPHIC) + "\\" + LLURI::escape(name) + ".xml");
+	std::string full_path(getPresetsDir(subdirectory) + gDirUtilp->getDirDelimiter() + LLURI::escape(name) + ".xml");
 
 	gSavedSettings.loadFromFile(full_path, false, true);
 }
 
-bool LLPresetsManager::deletePreset(const std::string& name)
+bool LLPresetsManager::deletePreset(const std::string& subdirectory, const std::string& name)
 {
-	// remove from param list
-	preset_name_list_t::iterator it = find(mPresetNames.begin(), mPresetNames.end(), name);
-	if (it == mPresetNames.end())
-	{
-		LL_WARNS("Presets") << "No preset named " << name << LL_ENDL;
-		return false;
-	}
-
-	if (gDirUtilp->deleteFilesInDir(getPresetsDir(PRESETS_GRAPHIC), LLURI::escape(name) + ".xml") < 1)
+	if (gDirUtilp->deleteFilesInDir(getPresetsDir(subdirectory), LLURI::escape(name) + ".xml") < 1)
 	{
 		LL_WARNS("Presets") << "Error removing preset " << name << " from disk" << LL_ENDL;
 		return false;
 	}
-	else
-	{
-		mPresetNames.erase(it);
-	}
 
 	// signal interested parties
 	mPresetListChangeSignal();
diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h
index 3a2542bda0..7bbaa778c6 100644
--- a/indra/newview/llpresetsmanager.h
+++ b/indra/newview/llpresetsmanager.h
@@ -46,8 +46,8 @@ public:
 	void setPresetNamesInComboBox(const std::string& subdirectory, LLComboBox* combo);
 	void loadPresetNamesFromDir(const std::string& dir, preset_name_list_t& presets);
 	void savePreset(const std::string& subdirectory, const std::string & name);
-	void loadPreset(const std::string & name);
-	bool deletePreset(const std::string& name);
+	void loadPreset(const std::string& subdirectory, const std::string & name);
+	bool deletePreset(const std::string& subdirectory, const std::string& name);
 
 	/// Emitted when a preset gets loaded or deleted.
 	boost::signals2::connection setPresetListChangeCallback(const preset_list_signal_t::slot_type& cb);
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 03360deaee..3ee67d8ac5 100755
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -101,6 +101,7 @@
 #include "llfloaterregioninfo.h"
 #include "llfloaterregionrestarting.h"
 #include "llfloaterreporter.h"
+#include "llfloatersaveprefpreset.h"
 #include "llfloatersceneloadstats.h"
 #include "llfloaterscriptdebug.h"
 #include "llfloaterscriptedprefs.h"
@@ -290,6 +291,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview");
 	LLFloaterReg::add("properties", "floater_inventory_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProperties>);
 	LLFloaterReg::add("publish_classified", "floater_publish_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPublishClassifiedFloater>);
+	LLFloaterReg::add("save_pref_preset", "floater_save_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSavePrefPreset>);
 	LLFloaterReg::add("script_colors", "floater_script_ed_prefs.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptEdPrefs>);
 
 	LLFloaterReg::add("telehubs", "floater_telehub.xml",&LLFloaterReg::build<LLFloaterTelehub>);
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..5919d9e3d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="130"
+ help_topic=""
+ layout="topleft"
+ name="Save Pref Preset"
+ save_rect="true"
+ title="SAVE PREF PRESET"
+ width="550">
+
+    <string name="title_graphic">Save Graphic Preset</string>
+    <string name="title_camera">Save Camera Preset</string>
+
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="50"
+     name="Preset"
+     top="60"
+     width="60">
+     Preset:
+    </text>
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     name="preset_combo"
+     top_delta="-5"
+     allow_text_entry="true"
+     width="200"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Save"
+     layout="topleft"
+     left_pad="15"
+     name="save"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel"
+     width="70"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f1d34a1449..e1d2f012d3 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7657,6 +7657,20 @@ Are you sure you want to close all IMs?
 Attachment has been saved.
   </notification>
 
+  <notification
+    icon="alertmodal.tga"
+	name="PresetSaved"
+    type="alertmodal">
+Preset [NAME] has been saved.
+  </notification>
+
+  <notification
+    icon="alertmodal.tga"
+	name="PresetDeleted"
+    type="alertmodal">
+Preset [NAME] has been deleted.
+  </notification>
+
   <notification
     icon="alertmodal.tga"
     name="UnableToFindHelpTopic"
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 3d7fdbb0ab..2a7560fd2c 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -31,7 +31,8 @@
    	top_delta="0"
    	width="150">
     <combo_box.commit_callback
-      function="Pref.Preset" />
+      function="Pref.Preset"
+      parameter="graphic" />
   </combo_box>
   <button
     follows="top|left"
@@ -43,7 +44,8 @@
     top_delta="0"
     width="115">
     <button.commit_callback
-      function="Pref.PrefSave" />
+      function="Pref.PrefSave"
+	  parameter="graphic"/>
   </button>
   <button
     follows="top|left"
-- 
cgit v1.3


From 8d12072979ee46a1eb2d13fdfef8bef62ff3f619 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 12 Dec 2014 11:13:11 -0500
Subject: STORM-2082 Merge Hardware floater into main graphics preferences
 display Change notifications so they are emitted only when an error occurs
 Put active preset at top of list Add Maximum ARC slider Merge two small
 methods into slider update code

---
 indra/newview/CMakeLists.txt                       |   2 -
 indra/newview/app_settings/settings.xml            |  11 ++
 indra/newview/llfloaterdeleteprefpreset.cpp        |   6 +-
 indra/newview/llfloaterhardwaresettings.cpp        | 201 -------------------
 indra/newview/llfloaterhardwaresettings.h          |  84 --------
 indra/newview/llfloaterpreference.cpp              | 168 +++++++++++-----
 indra/newview/llfloaterpreference.h                |   4 +-
 indra/newview/llfloatersaveprefpreset.cpp          |   8 +-
 indra/newview/llpanelpresetspulldown.cpp           |   2 +-
 indra/newview/llpresetsmanager.cpp                 |  21 +-
 indra/newview/llpresetsmanager.h                   |   5 +-
 indra/newview/llviewerfloaterreg.cpp               |   2 -
 .../newview/skins/default/xui/en/notifications.xml |   8 +-
 .../default/xui/en/panel_preferences_graphics1.xml | 218 +++++++++++++++++++--
 indra/newview/skins/default/xui/en/strings.xml     |   3 +-
 15 files changed, 362 insertions(+), 381 deletions(-)
 delete mode 100755 indra/newview/llfloaterhardwaresettings.cpp
 delete mode 100755 indra/newview/llfloaterhardwaresettings.h

(limited to 'indra/newview/llviewerfloaterreg.cpp')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 57fa11a0bf..192be979fb 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -243,7 +243,6 @@ set(viewer_SOURCE_FILES
     llfloatergroupinvite.cpp
     llfloatergroups.cpp
     llfloaterhandler.cpp
-    llfloaterhardwaresettings.cpp
     llfloaterhelpbrowser.cpp
     llfloaterhud.cpp
     llfloaterimagepreview.cpp
@@ -852,7 +851,6 @@ set(viewer_HEADER_FILES
     llfloatergroupinvite.h
     llfloatergroups.h
     llfloaterhandler.h
-    llfloaterhardwaresettings.h
     llfloaterhelpbrowser.h
     llfloaterhud.h
     llfloaterimagepreview.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6016839875..276a65edc5 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -15562,6 +15562,17 @@
       <key>Value</key>
       <string />
     </map>
+    <key>MaximumARC</key>
+    <map>
+      <key>Comment</key>
+      <string>Controls RenderAutoMuteRenderWeightLimit in a non-linear fashion</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
 </map>
 </llsd>
 
diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp
index 2f7d0552a3..f147a5ee90 100644
--- a/indra/newview/llfloaterdeleteprefpreset.cpp
+++ b/indra/newview/llfloaterdeleteprefpreset.cpp
@@ -74,10 +74,12 @@ void LLFloaterDeletePrefPreset::onBtnDelete()
 		{
 			LLPresetsManager::getInstance()->savePreset(mSubdirectory, PRESETS_DEFAULT);
 		}
-
+	}
+	else
+	{
 		LLSD args;
 		args["NAME"] = name;
-		LLNotificationsUtil::add("PresetDeleted", args);
+		LLNotificationsUtil::add("PresetNotDeleted", args);
 	}
 }
 
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
deleted file mode 100755
index 035eb307c2..0000000000
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/** 
- * @file llfloaterhardwaresettings.cpp
- * @brief Menu of all the different graphics hardware settings
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterhardwaresettings.h"
-
-// Viewer includes
-#include "llfloaterpreference.h"
-#include "llviewerwindow.h"
-#include "llviewercontrol.h"
-#include "llviewertexturelist.h"
-#include "llfeaturemanager.h"
-#include "llspinctrl.h"
-#include "llstartup.h"
-#include "lltextbox.h"
-#include "llcombobox.h"
-#include "pipeline.h"
-
-// Linden library includes
-#include "llradiogroup.h"
-#include "lluictrlfactory.h"
-#include "llwindow.h"
-#include "llsliderctrl.h"
-
-LLFloaterHardwareSettings::LLFloaterHardwareSettings(const LLSD& key)
-	: LLFloater(key),
-
-	  // these should be set on imminent refresh() call,
-	  // but init them anyway
-	  mUseVBO(0),
-	  mUseAniso(0),
-	  mFSAASamples(0),
-	  mGamma(0.0),
-	  mVideoCardMem(0),
-	  mFogRatio(0.0),
-	  mProbeHardwareOnStartup(FALSE)
-{
-}
-
-LLFloaterHardwareSettings::~LLFloaterHardwareSettings()
-{
-}
-
-void LLFloaterHardwareSettings::initCallbacks(void) 
-{
-}
-
-// menu maintenance functions
-
-void LLFloaterHardwareSettings::refresh()
-{
-	LLPanel::refresh();
-
-	mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
-	mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
-	mFSAASamples = gSavedSettings.getU32("RenderFSAASamples");
-	mGamma = gSavedSettings.getF32("RenderGamma");
-	mVideoCardMem = gSavedSettings.getS32("TextureMemory");
-	mFogRatio = gSavedSettings.getF32("RenderFogRatio");
-	mProbeHardwareOnStartup = gSavedSettings.getBOOL("ProbeHardwareOnStartup");
-
-	getChild<LLUICtrl>("fsaa")->setValue((LLSD::Integer) mFSAASamples);
-	refreshEnabledState();
-}
-
-void LLFloaterHardwareSettings::refreshEnabledState()
-{
-	F32 mem_multiplier = gSavedSettings.getF32("RenderTextureMemoryMultiple");
-	S32Megabytes min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
-	S32Megabytes max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting(false, mem_multiplier);
-	getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMinValue(min_tex_mem.value());
-	getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMaxValue(max_tex_mem.value());
-
-	if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
-		!gGLManager.mHasVertexBufferObject)
-	{
-		getChildView("vbo")->setEnabled(FALSE);
-	}
-
-	if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderCompressTextures") ||
-		!gGLManager.mHasVertexBufferObject)
-	{
-		getChildView("texture compression")->setEnabled(FALSE);
-	}
-
-	// if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
-	LLSpinCtrl* gamma_ctrl = getChild<LLSpinCtrl>("gamma");
-	gamma_ctrl->setEnabled(!gPipeline.canUseWindLightShaders());
-	getChildView("(brightness, lower is brighter)")->setEnabled(!gPipeline.canUseWindLightShaders());
-	getChildView("fog")->setEnabled(!gPipeline.canUseWindLightShaders());
-
-	// anti-aliasing
-	{
-		LLUICtrl* fsaa_ctrl = getChild<LLUICtrl>("fsaa");
-		LLTextBox* fsaa_text = getChild<LLTextBox>("antialiasing label");
-		LLView* fsaa_restart = getChildView("antialiasing restart");
-		
-		// Enable or disable the control, the "Antialiasing:" label and the restart warning
-		// based on code support for the feature on the current hardware.
-
-		if (gPipeline.canUseAntiAliasing())
-		{
-			fsaa_ctrl->setEnabled(TRUE);
-			
-			// borrow the text color from the gamma control for consistency
-			fsaa_text->setColor(gamma_ctrl->getEnabledTextColor());
-
-			fsaa_restart->setVisible(!gSavedSettings.getBOOL("RenderDeferred"));
-		}
-		else
-		{
-			fsaa_ctrl->setEnabled(FALSE);
-			fsaa_ctrl->setValue((LLSD::Integer) 0);
-			
-			// borrow the text color from the gamma control for consistency
-			fsaa_text->setColor(gamma_ctrl->getDisabledTextColor());
-			
-			fsaa_restart->setVisible(FALSE);
-		}
-	}
-}
-
-//============================================================================
-
-BOOL LLFloaterHardwareSettings::postBuild()
-{
-	childSetAction("OK", onBtnOK, this);
-
-// Don't do this on Mac as their braindead GL versioning
-// sets this when 8x and 16x are indeed available
-//
-#if !LL_DARWIN
-	if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f)
-	{ //remove FSAA settings above "4x"
-		LLComboBox* combo = getChild<LLComboBox>("fsaa");
-		combo->remove("8x");
-		combo->remove("16x");
-	}
-#endif
-
-	refresh();
-	center();
-
-	// load it up
-	initCallbacks();
-	return TRUE;
-}
-
-
-void LLFloaterHardwareSettings::apply()
-{
-	refresh();
-}
-
-
-void LLFloaterHardwareSettings::cancel()
-{
-	gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
-	gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
-	gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
-	gSavedSettings.setF32("RenderGamma", mGamma);
-	gSavedSettings.setS32("TextureMemory", mVideoCardMem);
-	gSavedSettings.setF32("RenderFogRatio", mFogRatio);
-	gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
-
-	closeFloater();
-}
-
-// static 
-void LLFloaterHardwareSettings::onBtnOK( void* userdata )
-{
-	LLFloaterHardwareSettings *fp =(LLFloaterHardwareSettings *)userdata;
-	fp->apply();
-	fp->closeFloater(false);
-}
-
-
diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h
deleted file mode 100755
index 626771b1d2..0000000000
--- a/indra/newview/llfloaterhardwaresettings.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/** 
- * @file llfloaterhardwaresettings.h
- * @brief Menu of all the different graphics hardware settings
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATER_HARDWARE_SETTINGS_H
-#define LL_LLFLOATER_HARDWARE_SETTINGS_H
-
-#include "llfloater.h"
-
-/// Menuing system for all of windlight's functionality
-class LLFloaterHardwareSettings : public LLFloater
-{
-	friend class LLFloaterPreference;
-
-public:
-
-	LLFloaterHardwareSettings(const LLSD& key);
-	/*virtual*/ ~LLFloaterHardwareSettings();
-	
-	/*virtual*/ BOOL postBuild();
-
-	/// initialize all the callbacks for the menu
-	void initCallbacks(void);
-
-	/// OK button
-	static void onBtnOK( void* userdata );
-	
-	//// menu management
-
-	/// show off our menu
-	static void show();
-
-	/// return if the menu exists or not
-	static bool isOpen();
-
-	/// sync up menu with parameters
-	void refresh();
-
-	/// Apply the changed values.
-	void apply();
-	
-	/// don't apply the changed values
-	void cancel();
-
-	/// refresh the enabled values
-	void refreshEnabledState();
-
-protected:
-	BOOL mUseVBO;
-	BOOL mUseAniso;
-	BOOL mUseFBO;
-	U32 mFSAASamples;
-	F32 mGamma;
-	S32 mVideoCardMem;
-	F32 mFogRatio;
-	BOOL mProbeHardwareOnStartup;
-
-private:
-};
-
-#endif
-
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index e0c579f783..c7b4ae8ddc 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -48,7 +48,6 @@
 //#include "llfirstuse.h"
 #include "llfloaterreg.h"
 #include "llfloaterabout.h"
-#include "llfloaterhardwaresettings.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llfloaterimsession.h"
 #include "llkeyboard.h"
@@ -112,6 +111,7 @@
 #include "llviewercontrol.h"
 #include "llpresetsmanager.h"
 #include "llfeaturemanager.h"
+#include "llviewertexturelist.h"
 
 const F32 MAX_USER_FAR_CLIP = 512.f;
 const F32 MIN_USER_FAR_CLIP = 64.f;
@@ -549,12 +549,6 @@ void LLFloaterPreference::apply()
 		if (panel)
 			panel->apply();
 	}
-	// hardware menu apply
-	LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
-	if (hardware_settings)
-	{
-		hardware_settings->apply();
-	}
 	
 	gViewerWindow->requestResolutionUpdate(); // for UIScaleFactor
 
@@ -632,13 +626,6 @@ void LLFloaterPreference::cancel()
 	// hide spellchecker settings folder
 	LLFloaterReg::hideInstance("prefs_spellchecker");
 	
-	// cancel hardware menu
-	LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
-	if (hardware_settings)
-	{
-		hardware_settings->cancel();
-	}
-	
 	// reverts any changes to current skin
 	gSavedSettings.setString("SkinCurrent", sSkin);
 
@@ -921,11 +908,6 @@ void LLFloaterPreference::refreshEnabledGraphics()
 		instance->refresh();
 		//instance->refreshEnabledState();
 	}
-	LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
-	if (hardware_settings)
-	{
-		hardware_settings->refreshEnabledState();
-	}
 }
 
 void LLFloaterPreference::onClickClearCache()
@@ -1201,7 +1183,61 @@ void LLFloaterPreference::refreshEnabledState()
 	enabled = enabled && LLFeatureManager::getInstance()->isFeatureAvailable("RenderShadowDetail");
 
 	ctrl_shadow->setEnabled(enabled);
-	
+
+	// Hardware settings
+	F32 mem_multiplier = gSavedSettings.getF32("RenderTextureMemoryMultiple");
+	S32Megabytes min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
+	S32Megabytes max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting(false, mem_multiplier);
+	getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMinValue(min_tex_mem.value());
+	getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMaxValue(max_tex_mem.value());
+
+	if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
+		!gGLManager.mHasVertexBufferObject)
+	{
+		getChildView("vbo")->setEnabled(FALSE);
+	}
+
+	if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderCompressTextures") ||
+		!gGLManager.mHasVertexBufferObject)
+	{
+		getChildView("texture compression")->setEnabled(FALSE);
+	}
+
+	// if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
+	LLUICtrl* gamma_ctrl = getChild<LLUICtrl>("gamma");
+	gamma_ctrl->setEnabled(!gPipeline.canUseWindLightShaders());
+	getChildView("(brightness, lower is brighter)")->setEnabled(!gPipeline.canUseWindLightShaders());
+	getChildView("fog")->setEnabled(!gPipeline.canUseWindLightShaders());
+
+	/* Disabling this block of code because canUseAntiAliasing currently always returns true
+	// anti-aliasing
+	LLComboBox* fsaa_ctrl = getChild<LLComboBox>("fsaa");
+	LLTextBox* fsaa_text = getChild<LLTextBox>("antialiasing label");
+	LLTextBox* fsaa_restart = getChild<LLTextBox>("antialiasing restart");
+		
+	// Enable or disable the control, the "Antialiasing:" label and the restart warning
+	// based on code support for the feature on the current hardware.
+
+	if (gPipeline.canUseAntiAliasing())
+	{
+		fsaa_ctrl->setEnabled(TRUE);
+
+		LLColor4 color = LLUIColorTable::instance().getColor("LabelTextColor");
+		fsaa_text->setColor(color);
+
+		fsaa_restart->setVisible(!gSavedSettings.getBOOL("RenderDeferred"));
+	}
+	else
+	{
+		fsaa_ctrl->setEnabled(FALSE);
+		fsaa_ctrl->setValue((LLSD::Integer) 0);
+			
+		LLColor4 color = LLUIColorTable::instance().getColor("LabelDisabledColor");
+		fsaa_text->setColor(color);
+			
+		fsaa_restart->setVisible(FALSE);
+	}
+	*/
 
 	// now turn off any features that are unavailable
 	disableUnavailableSettings();
@@ -1365,23 +1401,26 @@ void LLFloaterPreference::refresh()
 {
 	LLPanel::refresh();
 
+	getChild<LLUICtrl>("fsaa")->setValue((LLSD::Integer)  gSavedSettings.getU32("RenderFSAASamples"));
+
 	refreshEnabledState();
 
 	// sliders and their text boxes
 	//	mPostProcess = gSavedSettings.getS32("RenderGlowResolutionPow");
 	// slider text boxes
-	updateSliderText(getChild<LLSliderCtrl>("ObjectMeshDetail",		true), getChild<LLTextBox>("ObjectMeshDetailText",		true));
-	updateSliderText(getChild<LLSliderCtrl>("FlexibleMeshDetail",	true), getChild<LLTextBox>("FlexibleMeshDetailText",	true));
-	updateSliderText(getChild<LLSliderCtrl>("TreeMeshDetail",		true), getChild<LLTextBox>("TreeMeshDetailText",		true));
-	updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail",		true), getChild<LLTextBox>("AvatarMeshDetailText",		true));
-	updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail2",		true), getChild<LLTextBox>("AvatarMeshDetailText2",		true));
-	updateSliderText(getChild<LLSliderCtrl>("AvatarPhysicsDetail",	true), getChild<LLTextBox>("AvatarPhysicsDetailText",		true));
-	updateSliderText(getChild<LLSliderCtrl>("TerrainMeshDetail",	true), getChild<LLTextBox>("TerrainMeshDetailText",		true));
-	updateSliderText(getChild<LLSliderCtrl>("RenderPostProcess",	true), getChild<LLTextBox>("PostProcessText",			true));
-	updateSliderText(getChild<LLSliderCtrl>("SkyMeshDetail",		true), getChild<LLTextBox>("SkyMeshDetailText",			true));
-	updateSliderText(getChild<LLSliderCtrl>("TerrainDetail",		true), getChild<LLTextBox>("TerrainDetailText",			true));	
-	updateReflectionsText(getChild<LLSliderCtrl>("Reflections",		true), getChild<LLTextBox>("ReflectionsText",			true));	
-	updateShadowDetailText(getChild<LLSliderCtrl>("ShadowDetail",		true), getChild<LLTextBox>("RenderShadowDetailText",			true));	
+	updateSliderText(getChild<LLSliderCtrl>("ObjectMeshDetail",		true), getChild<LLTextBox>("ObjectMeshDetailText",		true), "ObjectMeshDetail");
+	updateSliderText(getChild<LLSliderCtrl>("FlexibleMeshDetail",	true), getChild<LLTextBox>("FlexibleMeshDetailText",	true), "FlexibleMeshDetail");
+	updateSliderText(getChild<LLSliderCtrl>("TreeMeshDetail",		true), getChild<LLTextBox>("TreeMeshDetailText",		true), "TreeMeshDetail");
+	updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail",		true), getChild<LLTextBox>("AvatarMeshDetailText",		true), "AvatarMeshDetail");
+	updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail2",		true), getChild<LLTextBox>("AvatarMeshDetailText2",		true), "AvatarMeshDetail2");
+	updateSliderText(getChild<LLSliderCtrl>("AvatarPhysicsDetail",	true), getChild<LLTextBox>("AvatarPhysicsDetailText",		true), "AvatarPhysicsDetail");
+	updateSliderText(getChild<LLSliderCtrl>("TerrainMeshDetail",	true), getChild<LLTextBox>("TerrainMeshDetailText",		true), "TerrainMeshDetail");
+	updateSliderText(getChild<LLSliderCtrl>("RenderPostProcess",	true), getChild<LLTextBox>("PostProcessText",			true), "RenderPostProcess");
+	updateSliderText(getChild<LLSliderCtrl>("SkyMeshDetail",		true), getChild<LLTextBox>("SkyMeshDetailText",			true), "SkyMeshDetail");
+	updateSliderText(getChild<LLSliderCtrl>("TerrainDetail",		true), getChild<LLTextBox>("TerrainDetailText",			true), "TerrainDetail");	
+	updateSliderText(getChild<LLSliderCtrl>("MaximumARC",		true), getChild<LLTextBox>("MaximumARCText",			true), "MaximumARC");	
+	updateSliderText(getChild<LLSliderCtrl>("Reflections",		true), getChild<LLTextBox>("ReflectionsText",			true), "Reflections");	
+	updateSliderText(getChild<LLSliderCtrl>("ShadowDetail",		true), getChild<LLTextBox>("RenderShadowDetailText",			true), "ShadowDetail");	
 }
 
 void LLFloaterPreference::onCommitWindowedMode()
@@ -1633,24 +1672,7 @@ void LLFloaterPreference::refreshUI()
 	refresh();
 }
 
-void LLFloaterPreference::updateReflectionsText(LLSliderCtrl* ctrl, LLTextBox* text_box)
-{
-	if (text_box == NULL || ctrl== NULL)
-		return;
-	
-	U32 value = (U32)ctrl->getValue().asInteger();
-	text_box->setText(getString("Reflections" + llformat("%d", value)));
-}
-void LLFloaterPreference::updateShadowDetailText(LLSliderCtrl* ctrl, LLTextBox* text_box)
-{
-	if (text_box == NULL || ctrl== NULL)
-		return;
-	
-	U32 value = (U32)ctrl->getValue().asInteger();
-	text_box->setText(getString("RenderShadowDetail" + llformat("%d", value)));
-}
-
-void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box)
+void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box, const std::string& name)
 {
 	if (text_box == NULL || ctrl== NULL)
 		return;
@@ -1663,7 +1685,21 @@ void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_b
 	llassert(range > 0);
 	F32 midPoint = min + range / 3.0f;
 	F32 highPoint = min + (2.0f * range / 3.0f);
-	
+
+	if ("ShadowDetail" == name)
+	{
+		U32 value = (U32)ctrl->getValue().asInteger();
+		text_box->setText(getString("RenderShadowDetail" + llformat("%d", value)));
+		return;
+	}
+
+	if ("Reflections" == name)
+	{
+		U32 value = (U32)ctrl->getValue().asInteger();
+		text_box->setText(getString("Reflections" + llformat("%d", value)));
+		return;
+	}
+
 	// choose the right text
 	if (value < midPoint)
 	{
@@ -1677,6 +1713,22 @@ void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_b
 	{
 		text_box->setText(LLTrans::getString("GraphicsQualityHigh"));
 	}
+
+	if ("MaximumARC" == name)
+	{
+		F32 control_value = value;
+		if (0.0f == control_value)
+		{
+			text_box->setText(LLTrans::getString("Off"));
+		}
+		else
+		{
+			// 13 is the maximum value of this control set in panel_preferences_graphics1.xml
+			control_value = exp(13.0f - control_value) + 20000.0f;
+		}
+
+		gSavedSettings.setU32("RenderAutoMuteRenderWeightLimit", (U32)control_value);
+	}
 }
 
 void LLFloaterPreference::onChangeMaturity()
@@ -2152,6 +2204,18 @@ static LLPanelInjector<LLPanelPreferencePrivacy> t_pref_privacy("panel_preferenc
 
 BOOL LLPanelPreferenceGraphics::postBuild()
 {
+// Don't do this on Mac as their braindead GL versioning
+// sets this when 8x and 16x are indeed available
+//
+#if !LL_DARWIN
+	if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f)
+	{ //remove FSAA settings above "4x"
+		LLComboBox* combo = getChild<LLComboBox>("fsaa");
+		combo->remove("8x");
+		combo->remove("16x");
+	}
+#endif
+
 	LLComboBox* combo = getChild<LLComboBox>("graphic_preset_combo");
 	combo->setLabel(LLTrans::getString("preset_combo_label"));
 
@@ -2171,7 +2235,7 @@ void LLPanelPreferenceGraphics::setPresetNamesInComboBox()
 {
 	LLComboBox* combo = getChild<LLComboBox>("graphic_preset_combo");
 
-	EDefaultOptions option = DEFAULT_POSITION_TOP;
+	EDefaultOptions option = DEFAULT_SHOW;
 	LLPresetsManager::getInstance()->setPresetNamesInComboBox(PRESETS_GRAPHIC, combo, option);
 }
 
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index d43c41272a..eebc0849ee 100755
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -156,9 +156,7 @@ public:
 	// if the quality radio buttons are changed
 	void onChangeQuality(const LLSD& data);
 	
-	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
-	void updateReflectionsText(LLSliderCtrl* ctrl, LLTextBox* text_box);
-	void updateShadowDetailText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box, const std::string& name);
 	void refreshUI();
 
 	void onCommitParcelMediaAutoPlayEnable();
diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp
index 02281d8b3c..610c701d8d 100644
--- a/indra/newview/llfloatersaveprefpreset.cpp
+++ b/indra/newview/llfloatersaveprefpreset.cpp
@@ -70,7 +70,7 @@ void LLFloaterSavePrefPreset::onOpen(const LLSD& key)
 
 	setTitle(floater_title);
 
-	EDefaultOptions option = DEFAULT_POSITION_TOP;
+	EDefaultOptions option = DEFAULT_SHOW;
 	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option);
 
 	onPresetNameEdited();
@@ -80,11 +80,11 @@ void LLFloaterSavePrefPreset::onBtnSave()
 {
 	std::string name = mPresetCombo->getSimple();
 
-	if (LLPresetsManager::getInstance()->savePreset(mSubdirectory, name))
+	if (!LLPresetsManager::getInstance()->savePreset(mSubdirectory, name))
 	{
 		LLSD args;
 		args["NAME"] = name;
-		LLNotificationsUtil::add("PresetSaved", args);
+		LLNotificationsUtil::add("PresetNotSaved", args);
 	}
 
 	closeFloater();
@@ -92,7 +92,7 @@ void LLFloaterSavePrefPreset::onBtnSave()
 
 void LLFloaterSavePrefPreset::onPresetsListChange()
 {
-	EDefaultOptions option = DEFAULT_POSITION_TOP;
+	EDefaultOptions option = DEFAULT_SHOW;
 	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option);
 }
 
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp
index 1918623cab..4756f3bd75 100644
--- a/indra/newview/llpanelpresetspulldown.cpp
+++ b/indra/newview/llpanelpresetspulldown.cpp
@@ -71,7 +71,7 @@ BOOL LLPanelPresetsPulldown::postBuild()
 void LLPanelPresetsPulldown::populatePanel()
 {
 	std::string presets_dir = LLPresetsManager::getInstance()->getPresetsDir(PRESETS_GRAPHIC);
-	LLPresetsManager::getInstance()->loadPresetNamesFromDir(presets_dir, mPresetNames, DEFAULT_POSITION_NORMAL);
+	LLPresetsManager::getInstance()->loadPresetNamesFromDir(presets_dir, mPresetNames, DEFAULT_SHOW);
 
 	LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
 
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 971a5ecf52..1c14cc6ece 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -99,20 +99,26 @@ void LLPresetsManager::loadPresetNamesFromDir(const std::string& dir, preset_nam
 		{
 			std::string path = gDirUtilp->add(dir, file);
 			std::string name = gDirUtilp->getBaseFileName(LLURI::unescape(path), /*strip_exten = */ true);
+			// Two things are happening here:
+			// 1 - Always put the active preset at the top of the list
+			// 2 - Possibly hide the default preset
 			if (PRESETS_DEFAULT != name)
 			{
-				mPresetNames.push_back(name);
+				if (name != gSavedSettings.getString("PresetGraphicActive"))
+				{
+					mPresetNames.push_back(name);
+				}
+				else
+				{
+					mPresetNames.insert(mPresetNames.begin(), name);
+				}
 			}
 			else
 			{
 				switch (default_option)
 				{
-					case DEFAULT_POSITION_TOP:
-						mPresetNames.insert(mPresetNames.begin(), name);
-						break;
-
-					case DEFAULT_POSITION_NORMAL:
-						mPresetNames.push_back(name);
+					case DEFAULT_SHOW:
+						mPresetNames.push_back(LLTrans::getString(PRESETS_DEFAULT));
 						break;
 
 					case DEFAULT_HIDE:
@@ -164,6 +170,7 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, const std::st
 			("RenderDeferredSSAO")
 			("RenderDepthOfField")
 			("RenderShadowDetail")
+			("RenderAutoMuteRenderWeightLimit")
 
 			("RenderAnisotropic")
 			("RenderFSAASamples")
diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h
index 180cca5bc4..bf6a531d48 100644
--- a/indra/newview/llpresetsmanager.h
+++ b/indra/newview/llpresetsmanager.h
@@ -39,9 +39,8 @@ static const std::string PRESETS_CAMERA = "camera";
 
 enum EDefaultOptions
 {
-	DEFAULT_POSITION_TOP,		// Put "Default" as the first item in the combobox
-	DEFAULT_POSITION_NORMAL,	// No special positioning
-	DEFAULT_HIDE				// Do not display "Default" in the combobox
+	DEFAULT_SHOW,
+	DEFAULT_HIDE				// Do not display "Default" in a list
 };
 
 class LLPresetsManager : public LLSingleton<LLPresetsManager>
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 3ee67d8ac5..8acb56d650 100755
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -69,7 +69,6 @@
 #include "llfloatergesture.h"
 #include "llfloatergodtools.h"
 #include "llfloatergroups.h"
-#include "llfloaterhardwaresettings.h"
 #include "llfloaterhelpbrowser.h"
 #include "llfloaterhud.h"
 #include "llfloaterimagepreview.h"
@@ -274,7 +273,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
 	LLFloaterReg::add("prefs_proxy", "floater_preferences_proxy.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceProxy>);
-	LLFloaterReg::add("prefs_hardware_settings", "floater_hardware_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHardwareSettings>);
 	LLFloaterReg::add("prefs_spellchecker_import", "floater_spellcheck_import.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSpellCheckerImport>);
 	LLFloaterReg::add("prefs_translation", "floater_translation_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTranslationSettings>);
 	LLFloaterReg::add("prefs_spellchecker", "floater_spellcheck.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSpellCheckerSettings>);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1618ea0ec7..340777faf3 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7659,16 +7659,16 @@ Attachment has been saved.
 
   <notification
     icon="notifytip.tga"
-	name="PresetSaved"
+	name="PresetNotSaved"
     type="notifytip">
-Preset [NAME] has been saved.
+Error saving preset [NAME].
   </notification>
 
   <notification
     icon="notifytip.tga"
-	name="PresetDeleted"
+	name="PresetNotDeleted"
     type="notifytip">
-Preset [NAME] has been deleted.
+Error deleting preset [NAME].
   </notification>
 
   <notification
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 d0a5075dc8..43b9d6003f 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -320,7 +320,7 @@
         <panel
           border="false"
           follows="top|left"
-          height="600"
+          height="700"
           label="CustomGraphics"
           layout="topleft"
           left="5"
@@ -542,9 +542,42 @@
             min_val="1"
             max_val="65"
             name="MaxNumberAvatarDrawn"
-            top_delta="20"
+            top_delta="16"
             width="325" />
 
+          <slider
+            control_name="MaximumARC"
+            follows="left|top"
+            height="16"
+            initial_value="0"
+            increment=".1"
+            label="Maximum ARC:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            min_val="0"
+            max_val="13"
+            name="MaximumARC"
+            show_text="false"
+            top_delta="16"
+            width="300">
+            <slider.commit_callback
+              function="Pref.UpdateSliderText"
+              parameter="MaximumARCText" />
+          </slider>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            top_delta="0"
+            left_delta="304"
+            name="MaximumARCText"
+            width="128">
+               Low
+          </text>
+
           <check_box
             control_name="RenderUseImpostors"
             height="16"
@@ -941,6 +974,173 @@
             width="128">
               None
           </text>
+
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            name="ShadersText"
+            top_delta="20"
+            left="5"
+            width="128">
+             Hardware
+          </text>
+
+
+          <slider
+            control_name="TextureMemory"
+            decimal_digits="0"
+            follows="left|top"
+            height="16"
+            increment="16"
+            initial_value="32"
+            label="Texture Memory (MB):"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            max_val="4096"
+            name="GraphicsCardTextureMemory"
+            tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
+            top_delta="16"
+            width="335" />
+
+          <slider
+            control_name="RenderFogRatio"
+            follows="left|top"
+            height="16"
+            initial_value="4"
+            decimal_digits="1"
+            label="Fog Distance Ratio:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            name="fog"
+            min_val="0.5"
+            max_val="10"
+            increment="0.1"
+            top_delta="16"
+            width="332" />
+
+          <slider
+            control_name="RenderGamma"
+            follows="left|top"
+            height="16"
+            initial_value="1"
+            decimal_digits="2"
+            label="Gamma:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            name="gamma"
+            min_val="0"
+            max_val="2"
+            increment="0.01"
+            top_delta="16"
+            width="332" />
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left="30"
+            name="(brightness, lower is brighter)"
+            top_delta="16"
+            width="230">
+              (0 = default brightness, lower = brighter)
+          </text>
+
+          <check_box
+            control_name="RenderAnisotropic"
+            height="16"
+            label="Anisotropic Filtering (slower when enabled)"
+            layout="topleft"
+            left="30"
+            name="ani"
+            top_delta="16"
+            width="256" />
+
+          <check_box
+            control_name="RenderVBOEnable"
+            height="16"
+            initial_value="true"
+            label="Enable OpenGL Vertex Buffer Objects"
+            layout="topleft"
+            left="30"
+            top_delta="16"
+            name="vbo"
+            tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+            width="315" />
+
+          <check_box
+            control_name="RenderCompressTextures"
+            height="16"
+            initial_value="true"
+            label="Enable Texture Compression (requires restart)"
+            layout="topleft"
+            left="30"
+            top_delta="16"
+            name="texture compression"
+            tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
+            width="315" />
+
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="20"
+            layout="topleft"
+            left="30"
+            name="antialiasing label"
+            top_delta="20"
+            width="100">
+              Antialiasing:
+          </text>
+          <combo_box
+            control_name="RenderFSAASamples"
+            height="20"
+            initial_value="false"
+            label="Antialiasing"
+            layout="topleft"
+            left_pad="40"
+            name="fsaa"
+            top_delta="0"
+            width="90">
+            <combo_box.item
+              label="Disabled"
+              name="FSAADisabled"
+              value="0" />
+            <combo_box.item
+              label="2x"
+              name="2x"
+              value="2" />
+            <combo_box.item
+             label="4x"
+             name="4x"
+             value="4" />
+            <combo_box.item
+             label="8x"
+             name="8x"
+             value="8" />
+            <combo_box.item
+             label="16x"
+             name="16x"
+             value="16" />
+          </combo_box>
+          <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="16"
+            layout="topleft"
+            left_pad="10"
+            name="antialiasing restart"
+            top_delta="0"
+            width="190">
+             (requires viewer restart)
+          </text>
         </panel>
       </scroll_container>
     </panel>
@@ -958,18 +1158,6 @@
       <button.commit_callback
         function="Pref.HardwareDefaults" />
     </button>
-    <button
-      follows="right|bottom"
-      height="23"
-      label="Hardware..."
-      label_selected="Hardware"
-      layout="topleft"
-      left_pad="25"
-      name="GraphicsHardwareButton"
-      top="310"
-      width="115">
-      <button.commit_callback
-        function="Pref.HardwareSettings" />
-    </button>
+
   </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1c655c6559..023c6e5bbb 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4044,5 +4044,6 @@ Try enclosing path to the editor with double quotes.
 
   <!-- Presets graphic/camera -->
   <string name="preset_combo_label">-Empty list-</string>
-
+  <string name="Default">Default</string>
+  <string name="Off">Off</string>
   </strings>
-- 
cgit v1.3


From 611391a818746f560ad49847ae643613313ac216 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 20 Jan 2015 09:17:23 -0500
Subject: STORM-2082 Update to new UI design.  Bugs are not worked out yet.

---
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llfloaterdeleteprefpreset.cpp        |  12 +-
 indra/newview/llfloaterloadprefpreset.cpp          |  92 +++++++++++++++
 indra/newview/llfloaterloadprefpreset.h            |  53 +++++++++
 indra/newview/llfloaterpreference.cpp              | 123 +++++++++++++--------
 indra/newview/llfloaterpreference.h                |   9 +-
 indra/newview/llpanelpresetspulldown.h             |   2 +-
 indra/newview/llpresetsmanager.cpp                 |  22 +++-
 indra/newview/llpresetsmanager.h                   |   4 +-
 indra/newview/llviewerfloaterreg.cpp               |   2 +
 .../default/xui/en/floater_load_pref_preset.xml    |  49 ++++++++
 .../default/xui/en/panel_preferences_graphics1.xml |  83 +++++++++-----
 indra/newview/skins/default/xui/en/strings.xml     |   1 +
 13 files changed, 358 insertions(+), 96 deletions(-)
 create mode 100644 indra/newview/llfloaterloadprefpreset.cpp
 create mode 100644 indra/newview/llfloaterloadprefpreset.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_load_pref_preset.xml

(limited to 'indra/newview/llviewerfloaterreg.cpp')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 192be979fb..d1b0aae542 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -255,6 +255,7 @@ set(viewer_SOURCE_FILES
     llfloaterlagmeter.cpp
     llfloaterland.cpp
     llfloaterlandholdings.cpp
+    llfloaterloadprefpreset.cpp
     llfloatermap.cpp
     llfloatermediasettings.cpp
     llfloatermemleak.cpp
@@ -866,6 +867,7 @@ set(viewer_HEADER_FILES
     llfloaterlagmeter.h
     llfloaterland.h
     llfloaterlandholdings.h
+    llfloaterloadprefpreset.h
     llfloatermap.h
     llfloatermediasettings.h
     llfloatermemleak.h
diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp
index f147a5ee90..5cd37d61fc 100644
--- a/indra/newview/llfloaterdeleteprefpreset.cpp
+++ b/indra/newview/llfloaterdeleteprefpreset.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file llfloaterdeletprefpreset.cpp
+ * @file llfloaterdeleteprefpreset.cpp
  * @brief Floater to delete a graphics / camera preset
  *
  * $LicenseInfo:firstyear=2014&license=viewerlgpl$
@@ -67,15 +67,7 @@ void LLFloaterDeletePrefPreset::onBtnDelete()
 	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
 	std::string name = combo->getSimple();
 
-	if (LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
-	{
-		// If you delete the active preset (which should never happen) then recreate it.
-		if (name == gSavedSettings.getString("PresetGraphicActive"))
-		{
-			LLPresetsManager::getInstance()->savePreset(mSubdirectory, PRESETS_DEFAULT);
-		}
-	}
-	else
+	if (!LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
 	{
 		LLSD args;
 		args["NAME"] = name;
diff --git a/indra/newview/llfloaterloadprefpreset.cpp b/indra/newview/llfloaterloadprefpreset.cpp
new file mode 100644
index 0000000000..6ec2e5c09d
--- /dev/null
+++ b/indra/newview/llfloaterloadprefpreset.cpp
@@ -0,0 +1,92 @@
+/** 
+ * @file llfloateloadprefpreset.cpp
+ * @brief Floater to load a graphics / camera preset
+ *
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2015, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterloadprefpreset.h"
+
+#include "llbutton.h"
+#include "llcombobox.h"
+#include "llfloaterpreference.h"
+#include "llfloaterreg.h"
+#include "llpresetsmanager.h"
+#include "llviewercontrol.h"
+
+LLFloaterLoadPrefPreset::LLFloaterLoadPrefPreset(const LLSD &key)
+:	LLFloater(key)
+{
+}
+
+// virtual
+BOOL LLFloaterLoadPrefPreset::postBuild()
+{
+	getChild<LLButton>("ok")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnOk, this));
+	getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnCancel, this));
+	LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterLoadPrefPreset::onPresetsListChange, this));
+
+	return TRUE;
+}
+
+void LLFloaterLoadPrefPreset::onOpen(const LLSD& key)
+{
+	mSubdirectory = key.asString();
+	std::string floater_title = getString(std::string("title_") + mSubdirectory);
+
+	setTitle(floater_title);
+
+	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+
+	EDefaultOptions option = DEFAULT_TOP;
+	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+}
+
+void LLFloaterLoadPrefPreset::onPresetsListChange()
+{
+	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+
+	EDefaultOptions option = DEFAULT_TOP;
+	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+}
+
+void LLFloaterLoadPrefPreset::onBtnCancel()
+{
+	closeFloater();
+}
+
+void LLFloaterLoadPrefPreset::onBtnOk()
+{
+	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+	std::string name = combo->getSimple();
+
+	LLPresetsManager::getInstance()->loadPreset(mSubdirectory, name);
+	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+	if (instance)
+	{
+		instance->refreshEnabledGraphics();
+	}
+
+	closeFloater();
+}
diff --git a/indra/newview/llfloaterloadprefpreset.h b/indra/newview/llfloaterloadprefpreset.h
new file mode 100644
index 0000000000..9471f6f1e1
--- /dev/null
+++ b/indra/newview/llfloaterloadprefpreset.h
@@ -0,0 +1,53 @@
+/** 
+ * @file llfloaterloadprefpreset.h
+ * @brief Floater to load a graphics / camera preset
+
+ *
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2015, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERLOADPREFPRESET_H
+#define LL_LLFLOATERLOADPREFPRESET_H
+
+#include "llfloater.h"
+
+class LLComboBox;
+
+class LLFloaterLoadPrefPreset : public LLFloater
+{
+
+public:
+	LLFloaterLoadPrefPreset(const LLSD &key);
+
+	/*virtual*/	BOOL	postBuild();
+	/*virtual*/ void	onOpen(const LLSD& key);
+
+	void onBtnOk();
+	void onBtnCancel();
+
+private:
+	void onPresetsListChange();
+
+	std::string mSubdirectory;
+};
+
+#endif // LL_LLFLOATERLOADPREFPRESET_H
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index cb59cc27d7..6dd030b280 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -107,6 +107,7 @@
 
 #include "lllogininstance.h"        // to check if logged in yet
 #include "llsdserialize.h"
+#include "llpanelpresetspulldown.h"
 #include "llpresetsmanager.h"
 #include "llviewercontrol.h"
 #include "llpresetsmanager.h"
@@ -735,11 +736,11 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 
 	bool started = (LLStartUp::getStartupState() == STATE_STARTED);
 
-	LLComboBox* combo = getChild<LLComboBox>("graphic_preset_combo");
+	LLButton* load_btn = findChild<LLButton>("PrefLoadButton");	
 	LLButton* save_btn = findChild<LLButton>("PrefSaveButton");	
 	LLButton* delete_btn = findChild<LLButton>("PrefDeleteButton");	
 
-	combo->setEnabled(started);
+	load_btn->setEnabled(started);
 	save_btn->setEnabled(started);
 	delete_btn->setEnabled(started);
 }
@@ -789,8 +790,6 @@ void LLFloaterPreference::setHardwareDefaults()
 		if (panel)
 			panel->setHardwareDefaults();
 	}
-
-	LLPresetsManager::getInstance()->savePreset(PRESETS_GRAPHIC, PRESETS_DEFAULT);
 }
 
 void LLFloaterPreference::getControlNames(std::vector<std::string>& names)
@@ -899,11 +898,6 @@ void LLFloaterPreference::onBtnOK()
 		LLFloaterPathfindingConsole* pPathfindingConsole = pathfindingConsoleHandle.get();
 		pPathfindingConsole->onRegionBoundaryCross();
 	}
-
-	// Write settings to currently defined preset.  This will recreate a missing preset file
-	// and ensure the preset file matches the current settings (which may have been changed
-	// via some other means).
-	LLPresetsManager::getInstance()->savePreset(PRESETS_GRAPHIC, gSavedSettings.getString("PresetGraphicActive"));
 }
 
 // static 
@@ -1156,11 +1150,11 @@ void LLFloaterPreference::refreshEnabledState()
 	if (gSavedSettings.getBOOL("VertexShaderEnable") == FALSE || 
 		gSavedSettings.getBOOL("RenderAvatarVP") == FALSE)
 	{
-		ctrl_avatar_cloth->setEnabled(false);
+		ctrl_avatar_cloth->setEnabled(FALSE);
 	} 
 	else
 	{
-		ctrl_avatar_cloth->setEnabled(true);
+		ctrl_avatar_cloth->setEnabled(TRUE);
 	}
 	
 	// Vertex Shaders
@@ -1174,14 +1168,16 @@ void LLFloaterPreference::refreshEnabledState()
 	BOOL shaders = ctrl_shader_enable->get();
 	if (shaders)
 	{
+llwarns << "DBG terrain OFF" << llendl;
 		terrain_detail->setValue(1);
 		terrain_detail->setEnabled(FALSE);
-		terrain_text->setEnabled(false);
+		terrain_text->setEnabled(FALSE);
 	}
 	else
 	{
+llwarns << "DBG terrain ON" << llendl;
 		terrain_detail->setEnabled(TRUE);
-		terrain_text->setEnabled(true);
+		terrain_text->setEnabled(TRUE);
 	}
 	
 	// WindLight
@@ -1331,12 +1327,12 @@ void LLFloaterPreference::disableUnavailableSettings()
 		ctrl_wind_light->setEnabled(FALSE);
 		ctrl_wind_light->setValue(FALSE);
 
-		sky->setEnabled(false);
-		sky_text->setEnabled(false);
+		sky->setEnabled(FALSE);
+		sky_text->setEnabled(FALSE);
 
 		ctrl_reflections->setEnabled(FALSE);
 		ctrl_reflections->setValue(0);
-		reflections_text->setEnabled(false);
+		reflections_text->setEnabled(FALSE);
 		
 		ctrl_avatar_vp->setEnabled(FALSE);
 		ctrl_avatar_vp->setValue(FALSE);
@@ -1346,7 +1342,7 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
-		shadows_text->setEnabled(false);
+		shadows_text->setEnabled(FALSE);
 		
 		ctrl_ssao->setEnabled(FALSE);
 		ctrl_ssao->setValue(FALSE);
@@ -1366,13 +1362,13 @@ void LLFloaterPreference::disableUnavailableSettings()
 		ctrl_wind_light->setEnabled(FALSE);
 		ctrl_wind_light->setValue(FALSE);
 
-		sky->setEnabled(false);
-		sky_text->setEnabled(false);
+		sky->setEnabled(FALSE);
+		sky_text->setEnabled(FALSE);
 
 		//deferred needs windlight, disable deferred
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
-		shadows_text->setEnabled(false);
+		shadows_text->setEnabled(FALSE);
 		
 		ctrl_ssao->setEnabled(FALSE);
 		ctrl_ssao->setValue(FALSE);
@@ -1392,7 +1388,7 @@ void LLFloaterPreference::disableUnavailableSettings()
 	{
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
-		shadows_text->setEnabled(false);
+		shadows_text->setEnabled(FALSE);
 		
 		ctrl_ssao->setEnabled(FALSE);
 		ctrl_ssao->setValue(FALSE);
@@ -1418,7 +1414,7 @@ void LLFloaterPreference::disableUnavailableSettings()
 	{
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
-		shadows_text->setEnabled(false);
+		shadows_text->setEnabled(FALSE);
 	}
 
 	// disabled reflections
@@ -1426,7 +1422,7 @@ void LLFloaterPreference::disableUnavailableSettings()
 	{
 		ctrl_reflections->setEnabled(FALSE);
 		ctrl_reflections->setValue(FALSE);
-		reflections_text->setEnabled(false);
+		reflections_text->setEnabled(FALSE);
 	}
 	
 	// disabled av
@@ -1441,7 +1437,7 @@ void LLFloaterPreference::disableUnavailableSettings()
 		//deferred needs AvatarVP, disable deferred
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
-		shadows_text->setEnabled(false);
+		shadows_text->setEnabled(FALSE);
 		
 		ctrl_ssao->setEnabled(FALSE);
 		ctrl_ssao->setValue(FALSE);
@@ -1488,7 +1484,6 @@ void LLFloaterPreference::refresh()
 	updateSliderText(getChild<LLSliderCtrl>("FlexibleMeshDetail",	true), getChild<LLTextBox>("FlexibleMeshDetailText",	true));
 	updateSliderText(getChild<LLSliderCtrl>("TreeMeshDetail",		true), getChild<LLTextBox>("TreeMeshDetailText",		true));
 	updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail",		true), getChild<LLTextBox>("AvatarMeshDetailText",		true));
-	updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail2",		true), getChild<LLTextBox>("AvatarMeshDetailText2",		true));
 	updateSliderText(getChild<LLSliderCtrl>("AvatarPhysicsDetail",	true), getChild<LLTextBox>("AvatarPhysicsDetailText",		true));
 	updateSliderText(getChild<LLSliderCtrl>("TerrainMeshDetail",	true), getChild<LLTextBox>("TerrainMeshDetailText",		true));
 	updateSliderText(getChild<LLSliderCtrl>("RenderPostProcess",	true), getChild<LLTextBox>("PostProcessText",			true));
@@ -1782,8 +1777,11 @@ void LLFloaterPreference::updateMaximumArcText(LLSliderCtrl* ctrl, LLTextBox* te
 
 	F32 value = (F32)ctrl->getValue().asReal();
 
-	if (0.0f == value)
+	if (101.0f == value)
 	{
+		// It has been decided that having the slider all the way to the right will be the off position, which
+		// is a value of 101, so it is necessary to change value to 0 disable impostor generation.
+		value = 0.0f;
 		text_box->setText(LLTrans::getString("Off"));
 	}
 	else
@@ -2007,9 +2005,9 @@ LLPanelPreference::LLPanelPreference()
 {
 	mCommitCallbackRegistrar.add("Pref.setControlFalse",	boost::bind(&LLPanelPreference::setControlFalse,this, _2));
 	mCommitCallbackRegistrar.add("Pref.updateMediaAutoPlayCheckbox",	boost::bind(&LLPanelPreference::updateMediaAutoPlayCheckbox, this, _1));
-	mCommitCallbackRegistrar.add("Pref.Preset",	boost::bind(&LLPanelPreference::onChangePreset, this, _2));
 	mCommitCallbackRegistrar.add("Pref.PrefDelete",	boost::bind(&LLPanelPreference::DeletePreset, this, _2));
 	mCommitCallbackRegistrar.add("Pref.PrefSave",	boost::bind(&LLPanelPreference::SavePreset, this, _2));
+	mCommitCallbackRegistrar.add("Pref.PrefLoad",	boost::bind(&LLPanelPreference::LoadPreset, this, _2));
 }
 
 //virtual
@@ -2219,19 +2217,10 @@ void LLPanelPreference::SavePreset(const LLSD& user_data)
 	LLFloaterReg::showInstance("save_pref_preset", subdirectory);
 }
 
-void LLPanelPreference::onChangePreset(const LLSD& user_data)
+void LLPanelPreference::LoadPreset(const LLSD& user_data)
 {
 	std::string subdirectory = user_data.asString();
-
-	LLComboBox* combo = getChild<LLComboBox>(subdirectory + "_preset_combo");
-	std::string name = combo->getSimple();
-
-	LLPresetsManager::getInstance()->loadPreset(subdirectory, name);
-	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
-	if (instance)
-	{
-		instance->refreshEnabledGraphics();
-	}
+	LLFloaterReg::showInstance("load_pref_preset", subdirectory);
 }
 
 void LLPanelPreference::setHardwareDefaults()
@@ -2293,27 +2282,52 @@ BOOL LLPanelPreferenceGraphics::postBuild()
 	}
 #endif
 
-	LLComboBox* combo = getChild<LLComboBox>("graphic_preset_combo");
-	combo->setLabel(LLTrans::getString("preset_combo_label"));
-
-	setPresetNamesInComboBox();
-
+	setPresetText();
 	LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLPanelPreferenceGraphics::onPresetsListChange, this));
 
 	return LLPanelPreference::postBuild();
 }
 
+void LLPanelPreferenceGraphics::draw()
+{
+	LLPanelPreference::draw();
+	setPresetText();
+}
+
 void LLPanelPreferenceGraphics::onPresetsListChange()
 {
-	setPresetNamesInComboBox();
+	resetDirtyChilds();
+	setPresetText();
 }
 
-void LLPanelPreferenceGraphics::setPresetNamesInComboBox()
+void LLPanelPreferenceGraphics::setPresetText()
 {
-	LLComboBox* combo = getChild<LLComboBox>("graphic_preset_combo");
+	LLTextBox* preset_text = getChild<LLTextBox>("preset_text");
 
-	EDefaultOptions option = DEFAULT_SHOW;
-	LLPresetsManager::getInstance()->setPresetNamesInComboBox(PRESETS_GRAPHIC, combo, option);
+	if (hasDirtyChilds())
+	{
+		gSavedSettings.setString("PresetGraphicActive", "");
+
+		LLPanelPresetsPulldown* instance = LLFloaterReg::findTypedInstance<LLPanelPresetsPulldown>("presets_pulldown");
+		if (instance)
+		{
+llwarns << "DBG populate" << llendl;
+			instance->populatePanel();
+		}
+	}
+
+	std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
+
+	if (!preset_graphic_active.empty())
+	{
+		preset_text->setText(preset_graphic_active);
+	}
+	else
+	{
+		preset_text->setText(LLTrans::getString("none_paren_cap"));
+	}
+
+	preset_text->resetDirty();
 }
 
 bool LLPanelPreferenceGraphics::hasDirtyChilds()
@@ -2330,7 +2344,18 @@ bool LLPanelPreferenceGraphics::hasDirtyChilds()
 		if (ctrl)
 		{
 			if (ctrl->isDirty())
-				return true;
+			{
+				LLControlVariable* control = ctrl->getControlVariable();
+				if (control)
+				{
+					std::string control_name = control->getName();
+					if ((control_name != "RenderDeferred") && (control_name != "RenderTerrainDetail"))
+					{
+llwarns << "DBG " << control_name << llendl;
+						return true;
+					}
+				}
+			}
 		}
 		// Push children onto the end of the work stack
 		for (child_list_t::const_iterator iter = curview->getChildList()->begin();
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 96d026277f..f73560e3c5 100755
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -222,9 +222,9 @@ public:
 	// cancel() can restore them.
 	virtual void saveSettings();
 
-	void onChangePreset(const LLSD& user_data);
 	void DeletePreset(const LLSD& user_data);
 	void SavePreset(const LLSD& user_data);
+	void LoadPreset(const LLSD& user_data);
 
 	class Updater;
 
@@ -248,15 +248,18 @@ class LLPanelPreferenceGraphics : public LLPanelPreference
 {
 public:
 	BOOL postBuild();
+	void draw();
 	void cancel();
 	void saveSettings();
+	void resetDirtyChilds();
 	void setHardwareDefaults();
-	void setPresetNamesInComboBox();
+	void setPresetText();
+
 	static const std::string getPresetsPath();
 
 protected:
 	bool hasDirtyChilds();
-	void resetDirtyChilds();
+private:
 	void onPresetsListChange();
 };
 
diff --git a/indra/newview/llpanelpresetspulldown.h b/indra/newview/llpanelpresetspulldown.h
index f3e0340247..146ccc0b09 100644
--- a/indra/newview/llpanelpresetspulldown.h
+++ b/indra/newview/llpanelpresetspulldown.h
@@ -43,9 +43,9 @@ class LLPanelPresetsPulldown : public LLPanel
 	/*virtual*/ void onTopLost();
 	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );
 	/*virtual*/ BOOL postBuild();
+	void populatePanel();
 	
  private:
-	void populatePanel();
 	void onGraphicsButtonClick(const LLSD& user_data);
 	void onRowClick(const LLSD& user_data);
 
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 67d06ff5dd..05138ee0c3 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -54,14 +54,14 @@ void LLPresetsManager::createMissingDefault()
 	{
 		LL_WARNS() << "No " << default_file << " found -- creating one" << LL_ENDL;
 		// Write current graphic settings to default.xml
-		// If this name is to be localized additional code will be needed to delete the old default
+		// *TODO: If this name is to be localized additional code will be needed to delete the old default
 		// when changing languages.
 		savePreset(PRESETS_GRAPHIC, PRESETS_DEFAULT);
-	}
 
-	if (gSavedSettings.getString("PresetGraphicActive").empty())
-	{
-		gSavedSettings.setString("PresetGraphicActive", PRESETS_DEFAULT);
+		if (gSavedSettings.getString("PresetGraphicActive").empty())
+		{
+			gSavedSettings.setString("PresetGraphicActive", PRESETS_DEFAULT);
+		}
 	}
 }
 
@@ -187,6 +187,8 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, const std::st
 	formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
 	presetsXML.close();
 
+	gSavedSettings.setString("PresetGraphicActive", name);
+
 	// signal interested parties
 	mPresetListChangeSignal();
 
@@ -234,6 +236,10 @@ void LLPresetsManager::loadPreset(const std::string& subdirectory, const std::st
 
 	if(gSavedSettings.loadFromFile(full_path, false, true) > 0)
 	{
+		if(PRESETS_GRAPHIC == subdirectory)
+		{
+			gSavedSettings.setString("PresetGraphicActive", name);
+		}
 		mPresetListChangeSignal();
 	}
 }
@@ -252,6 +258,12 @@ bool LLPresetsManager::deletePreset(const std::string& subdirectory, const std::
 		return false;
 	}
 
+	// If you delete the preset that is currently marked as loaded then also indicate that no preset is loaded.
+	if (gSavedSettings.getString("PresetGraphicActive") == name)
+	{
+		gSavedSettings.setString("PresetGraphicActive", "");
+	}
+
 	// signal interested parties
 	mPresetListChangeSignal();
 
diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h
index e9ed164322..50fe9f4216 100644
--- a/indra/newview/llpresetsmanager.h
+++ b/indra/newview/llpresetsmanager.h
@@ -59,9 +59,11 @@ public:
 	void loadPreset(const std::string& subdirectory, const std::string & name);
 	bool deletePreset(const std::string& subdirectory, const std::string& name);
 
-	/// Emitted when a preset gets loaded or deleted.
+	// Emitted when a preset gets loaded, deleted, or saved.
 	boost::signals2::connection setPresetListChangeCallback(const preset_list_signal_t::slot_type& cb);
 
+	// Emitted when a preset gets loaded or saved.
+
 	preset_name_list_t mPresetNames;
 
 	LLPresetsManager();
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 8acb56d650..5ab7551849 100755
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -79,6 +79,7 @@
 #include "llfloaterlagmeter.h"
 #include "llfloaterland.h"
 #include "llfloaterlandholdings.h"
+#include "llfloaterloadprefpreset.h"
 #include "llfloatermap.h"
 #include "llfloatermediasettings.h"
 #include "llfloatermemleak.h"
@@ -242,6 +243,7 @@ void LLViewerFloaterReg::registerFloaters()
 	
 	LLFloaterReg::add("lagmeter", "floater_lagmeter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLagMeter>);
 	LLFloaterReg::add("land_holdings", "floater_land_holdings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLandHoldings>);
+	LLFloaterReg::add("load_pref_preset", "floater_load_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLoadPrefPreset>);
 	
 	LLFloaterReg::add("mem_leaking", "floater_mem_leaking.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMemLeak>);
 
diff --git a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..72feeeef74
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="130"
+ help_topic="floater_load_pref"
+ layout="topleft"
+ name="Load Pref Preset"
+ save_rect="true"
+ title="LOAD PREF PRESET"
+ width="550">
+
+    <string name="title_graphic">Load Graphic Preset</string>
+    <string name="title_camera">Load Camera Preset</string>
+
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="50"
+     name="Preset"
+     top="60"
+     width="60">
+     Preset:
+    </text>
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     name="preset_combo"
+     top_delta="-5"
+     width="200"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="OK"
+     layout="topleft"
+     left_pad="15"
+     name="ok"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel"
+     width="70"/>
+</floater>
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 983e0edb97..b5a1c1eda6 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -17,36 +17,37 @@
     height="16"
     layout="topleft"
     left="5"
-    name="presets_text"
     top="10"
-    width="60">
-      Presets:
+    width="100">
+      Preset in use:
+  </text>
+
+  <text
+    follows="top|left|right"
+    font="SansSerif"
+    height="16"
+    layout="topleft"
+    left_delta="110"
+    name="preset_text"
+    top="10"
+    width="120">
+      (None)
   </text>
-  <combo_box
-   	follows="top|left"
-   	layout="topleft"
-   	left_pad="0"
-   	max_chars="100"
-   	name="graphic_preset_combo"
-   	top_delta="0"
-   	width="150">
-    <combo_box.commit_callback
-      function="Pref.Preset"
-      parameter="graphic" />
-  </combo_box>
+
   <button
     follows="top|left"
     height="23"
-    label="Save As..."
+    label="Load preset..."
     layout="topleft"
     left_pad="5"
-    name="PrefSaveButton"
+    name="PrefLoadButton"
     top_delta="0"
     width="115">
     <button.commit_callback
-      function="Pref.PrefSave"
+      function="Pref.PrefLoad"
 	  parameter="graphic"/>
   </button>
+
   <button
     follows="top|left"
     height="23"
@@ -60,6 +61,7 @@
       function="Pref.PrefDelete"
 	  parameter="graphic"/>
   </button>
+
   <text
     type="string"
     length="1"
@@ -255,6 +257,19 @@
       top="30"
       width="517">
 
+      <button
+        follows="top|left"
+        height="23"
+        label="Reset all to recommended settings"
+        layout="topleft"
+        left="10"
+        name="Defaults"
+        top_delta="0"
+        width="250">
+        <button.commit_callback
+          function="Pref.HardwareDefaults" />
+      </button>
+
       <slider
         control_name="RenderFarClip"
         decimal_digits="0"
@@ -269,7 +284,7 @@
         min_val="64"
         max_val="512"
         name="DrawDistance"
-        top_delta="0"
+        top_delta="40"
         width="330" />
       <text
         type="string"
@@ -348,6 +363,19 @@
           top_delta="0"
           width="485">
 
+          <button
+            follows="top|left"
+            height="23"
+            label="Reset all to recommended settings"
+            layout="topleft"
+            left="0"
+            name="Defaults"
+            top="0"
+            width="250">
+            <button.commit_callback
+              function="Pref.HardwareDefaults" />
+          </button>
+
           <text
             type="string"
             length="1"
@@ -355,7 +383,7 @@
             height="16"
             layout="topleft"
             name="GeneralText"
-            top="0"
+            top_delta="25"
             left="5"
             width="128">
              General
@@ -471,14 +499,14 @@
             control_name="MaximumARC"
             follows="left|top"
             height="16"
-            initial_value="0"
+            initial_value="101"
             increment="1"
             label="Maximum ARC:"
             label_width="165"
             layout="topleft"
             left="50"
-            min_val="0"
-            max_val="100"
+            min_val="1"
+            max_val="101"
             name="MaximumARC"
             show_text="false"
             top_delta="16"
@@ -1185,14 +1213,15 @@
     <button
       follows="left|bottom"
       height="23"
-      label="Recommended Settings"
+      label="Save settings as a preset..."
       layout="topleft"
       left="10"
-      name="Defaults"
+      name="PrefSaveButton"
       top="310"
-      width="200">
+      width="250">
       <button.commit_callback
-        function="Pref.HardwareDefaults" />
+        function="Pref.PrefSave"
+        parameter="graphic" />
     </button>
   </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 023c6e5bbb..c09129c867 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4046,4 +4046,5 @@ Try enclosing path to the editor with double quotes.
   <string name="preset_combo_label">-Empty list-</string>
   <string name="Default">Default</string>
   <string name="Off">Off</string>
+  <string name="none_paren_cap">(None)</string>
   </strings>
-- 
cgit v1.3


From b4c99cbb0aafc077c67b868ecb2d4c802355f472 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 11 Feb 2015 13:28:39 -0500
Subject: STORM-2082 Attempt to put advanced settings into separate floater

---
 indra/newview/llfloaterpreference.cpp              |  121 ++-
 indra/newview/llfloaterpreference.h                |   29 +-
 indra/newview/llviewerfloaterreg.cpp               |    1 +
 .../en/floater_preferences_graphics_advanced.xml   |  862 ++++++++++++++++
 .../default/xui/en/panel_preferences_graphics1.xml | 1084 ++------------------
 5 files changed, 1079 insertions(+), 1018 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml

(limited to 'indra/newview/llviewerfloaterreg.cpp')

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 0ac18408db..d2dfb63f9d 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -351,6 +351,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.AutoReplace",            boost::bind(&LLFloaterPreference::onClickAutoReplace, this));
 	mCommitCallbackRegistrar.add("Pref.PermsDefault",           boost::bind(&LLFloaterPreference::onClickPermsDefault, this));
 	mCommitCallbackRegistrar.add("Pref.SpellChecker",           boost::bind(&LLFloaterPreference::onClickSpellChecker, this));
+	mCommitCallbackRegistrar.add("Pref.Advanced",				boost::bind(&LLFloaterPreference::onClickAdvanced, this));
 
 	sSkin = gSavedSettings.getString("SkinCurrent");
 
@@ -621,6 +622,9 @@ void LLFloaterPreference::cancel()
 	
 	// hide spellchecker settings folder
 	LLFloaterReg::hideInstance("prefs_spellchecker");
+
+	// hide advancede floater
+	LLFloaterReg::hideInstance("prefs_graphics_advanced");
 	
 	// reverts any changes to current skin
 	gSavedSettings.setString("SkinCurrent", sSkin);
@@ -745,6 +749,22 @@ void LLFloaterPreference::onVertexShaderEnable()
 	refreshEnabledGraphics();
 }
 
+void LLFloaterPreferenceGraphicsAdvanced::onVertexShaderEnable()
+{
+	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+	if (instance)
+	{
+		instance->refresh();
+	}
+
+	refreshEnabledGraphics();
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledGraphics()
+{
+	refreshEnabledState();
+}
+
 void LLFloaterPreference::onAvatarImpostorsEnable()
 {
 	refreshEnabledGraphics();
@@ -792,10 +812,12 @@ void LLFloaterPreference::setHardwareDefaults()
 void LLFloaterPreference::getControlNames(std::vector<std::string>& names)
 {
 	LLView* view = findChild<LLView>("display");
-	if (view)
+	LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
+	if (view && advanced)
 	{
 		std::list<LLView*> stack;
 		stack.push_back(view);
+		stack.push_back(advanced);
 		while(!stack.empty())
 		{
 			// Process view on top of the stack
@@ -930,6 +952,12 @@ void LLFloaterPreference::refreshEnabledGraphics()
 	{
 		instance->refresh();
 	}
+
+	LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
+	if (advanced)
+	{
+		advanced->refresh();
+	}
 }
 
 void LLFloaterPreference::onClickClearCache()
@@ -1111,7 +1139,37 @@ void LLFloaterPreference::buildPopupLists()
 }
 
 void LLFloaterPreference::refreshEnabledState()
-{	
+{
+	LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
+	LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
+
+	// if vertex shaders off, disable all shader related products
+	if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") ||
+		!LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders"))
+	{
+		ctrl_wind_light->setEnabled(FALSE);
+		ctrl_wind_light->setValue(FALSE);
+	}
+	else
+	{
+		ctrl_wind_light->setEnabled(gSavedSettings.getBOOL("VertexShaderEnable"));
+	}
+
+	//Deferred/SSAO/Shadows
+	BOOL bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump") && gSavedSettings.getBOOL("RenderObjectBump");
+	BOOL shaders = gSavedSettings.getBOOL("WindLightUseAtmosShaders") && gSavedSettings.getBOOL("VertexShaderEnable");
+	BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
+						bumpshiny &&
+						shaders && 
+						gGLManager.mHasFramebufferObject &&
+						gSavedSettings.getBOOL("RenderAvatarVP") &&
+						(ctrl_wind_light->get()) ? TRUE : FALSE;
+
+	ctrl_deferred->setEnabled(enabled);
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
+{
 	LLComboBox* ctrl_reflections = getChild<LLComboBox>("Reflections");
 	LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
 	
@@ -1175,22 +1233,18 @@ void LLFloaterPreference::refreshEnabledState()
 	
 	// WindLight
 	LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
-	LLCheckBoxCtrl* ctrl_wind_light2 = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders2");
 	LLSliderCtrl* sky = getChild<LLSliderCtrl>("SkyMeshDetail");
 	LLTextBox* sky_text = getChild<LLTextBox>("SkyMeshDetailText");
 
 	// *HACK just checks to see if we can use shaders... 
 	// maybe some cards that use shaders, but don't support windlight
 	ctrl_wind_light->setEnabled(ctrl_shader_enable->getEnabled() && shaders);
-	ctrl_wind_light2->setEnabled(ctrl_shader_enable->getEnabled() && shaders);
 
 	sky->setEnabled(ctrl_wind_light->get() && shaders);
 	sky_text->setEnabled(ctrl_wind_light->get() && shaders);
 
 	//Deferred/SSAO/Shadows
 	LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
-	LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
-
 	
 	BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
 						((bumpshiny_ctrl && bumpshiny_ctrl->get()) ? TRUE : FALSE) &&
@@ -1200,7 +1254,6 @@ void LLFloaterPreference::refreshEnabledState()
 						(ctrl_wind_light->get()) ? TRUE : FALSE;
 
 	ctrl_deferred->setEnabled(enabled);
-	ctrl_deferred2->setEnabled(enabled);
 
 	LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
 	LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
@@ -1291,7 +1344,7 @@ void LLFloaterPreference::refreshEnabledState()
 	getChild<LLButton>("default_creation_permissions")->setEnabled(LLStartUp::getStartupState() < STATE_STARTED ? false : true);
 }
 
-void LLFloaterPreference::disableUnavailableSettings()
+void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
 {	
 	LLComboBox* ctrl_reflections   = getChild<LLComboBox>("Reflections");
 	LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
@@ -1302,7 +1355,6 @@ void LLFloaterPreference::disableUnavailableSettings()
 	LLSliderCtrl* ctrl_maximum_arc = getChild<LLSliderCtrl>("MaximumARC");
 	LLTextBox* maximum_arc_text = getChild<LLTextBox>("MaximumARCText");
 	LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
-	LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
 	LLComboBox* ctrl_shadows = getChild<LLComboBox>("ShadowDetail");
 	LLTextBox* shadows_text = getChild<LLTextBox>("RenderShadowDetailText");
 	LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
@@ -1344,8 +1396,6 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_deferred->setEnabled(FALSE);
 		ctrl_deferred->setValue(FALSE);
-		ctrl_deferred2->setEnabled(FALSE);
-		ctrl_deferred2->setValue(FALSE);
 	}
 	
 	// disabled windlight
@@ -1370,8 +1420,6 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_deferred->setEnabled(FALSE);
 		ctrl_deferred->setValue(FALSE);
-		ctrl_deferred2->setEnabled(FALSE);
-		ctrl_deferred2->setValue(FALSE);
 	}
 
 	// disabled deferred
@@ -1390,8 +1438,6 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_deferred->setEnabled(FALSE);
 		ctrl_deferred->setValue(FALSE);
-		ctrl_deferred2->setEnabled(FALSE);
-		ctrl_deferred2->setValue(FALSE);
 	}
 	
 	// disabled deferred SSAO
@@ -1439,8 +1485,6 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_deferred->setEnabled(FALSE);
 		ctrl_deferred->setValue(FALSE);
-		ctrl_deferred2->setEnabled(FALSE);
-		ctrl_deferred2->setValue(FALSE);
 	}
 
 	// disabled cloth
@@ -1461,6 +1505,18 @@ void LLFloaterPreference::disableUnavailableSettings()
 void LLFloaterPreference::refresh()
 {
 	LLPanel::refresh();
+	refreshEnabledState();
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::draw()
+{
+	refresh();
+	LLFloater::draw();
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::refresh()
+{
+	refreshEnabledState();
 
 	getChild<LLUICtrl>("fsaa")->setValue((LLSD::Integer)  gSavedSettings.getU32("RenderFSAASamples"));
 
@@ -1731,7 +1787,7 @@ void LLFloaterPreference::refreshUI()
 	refresh();
 }
 
-void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box)
+void LLFloaterPreferenceGraphicsAdvanced::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box)
 {
 	if (text_box == NULL || ctrl== NULL)
 		return;
@@ -1760,7 +1816,7 @@ void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_b
 	}
 }
 
-void LLFloaterPreference::updateImpostorsText(LLSliderCtrl* ctrl, LLTextBox* text_box)
+void LLFloaterPreferenceGraphicsAdvanced::updateImpostorsText(LLSliderCtrl* ctrl, LLTextBox* text_box)
 {
 	F32 value = (F32)ctrl->getValue().asReal();
 
@@ -1779,7 +1835,7 @@ void LLFloaterPreference::updateImpostorsText(LLSliderCtrl* ctrl, LLTextBox* tex
 	}
 }
 
-void LLFloaterPreference::updateMaximumArcText(LLSliderCtrl* ctrl, LLTextBox* text_box)
+void LLFloaterPreferenceGraphicsAdvanced::updateMaximumArcText(LLSliderCtrl* ctrl, LLTextBox* text_box)
 {
 	F32 min_result = 20000.0f;
 	F32 max_result = 300000.0f;
@@ -1857,6 +1913,11 @@ void LLFloaterPreference::onClickSpellChecker()
 		LLFloaterReg::showInstance("prefs_spellchecker");
 }
 
+void LLFloaterPreference::onClickAdvanced()
+{
+	LLFloaterReg::showInstance("prefs_graphics_advanced");
+}
+
 void LLFloaterPreference::onClickActionChange()
 {
 	mClickActionDirty = true;
@@ -2115,10 +2176,13 @@ void LLPanelPreference::apply()
 
 void LLPanelPreference::saveSettings()
 {
+	LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
+
 	// Save the value of all controls in the hierarchy
 	mSavedValues.clear();
 	std::list<LLView*> view_stack;
 	view_stack.push_back(this);
+	view_stack.push_back(advanced);
 	while(!view_stack.empty())
 	{
 		// Process view on top of the stack
@@ -2279,6 +2343,9 @@ static LLPanelInjector<LLPanelPreferencePrivacy> t_pref_privacy("panel_preferenc
 
 BOOL LLPanelPreferenceGraphics::postBuild()
 {
+	LLFloaterReg::showInstance("prefs_graphics_advanced");
+	LLFloaterReg::hideInstance("prefs_graphics_advanced");
+
 // Don't do this on Mac as their braindead GL versioning
 // sets this when 8x and 16x are indeed available
 //
@@ -2340,8 +2407,10 @@ void LLPanelPreferenceGraphics::setPresetText()
 
 bool LLPanelPreferenceGraphics::hasDirtyChilds()
 {
+	LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
 	std::list<LLView*> view_stack;
 	view_stack.push_back(this);
+	view_stack.push_back(advanced);
 	while(!view_stack.empty())
 	{
 		// Process view on top of the stack
@@ -2377,8 +2446,10 @@ bool LLPanelPreferenceGraphics::hasDirtyChilds()
 
 void LLPanelPreferenceGraphics::resetDirtyChilds()
 {
+	LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
 	std::list<LLView*> view_stack;
 	view_stack.push_back(this);
+	view_stack.push_back(advanced);
 	while(!view_stack.empty())
 	{
 		// Process view on top of the stack
@@ -2414,6 +2485,16 @@ void LLPanelPreferenceGraphics::setHardwareDefaults()
 	LLPanelPreference::setHardwareDefaults();
 }
 
+LLFloaterPreferenceGraphicsAdvanced::LLFloaterPreferenceGraphicsAdvanced(const LLSD& key)
+	: LLFloater(key)
+{
+	mCommitCallbackRegistrar.add("Pref.VertexShaderEnable",		boost::bind(&LLFloaterPreferenceGraphicsAdvanced::onVertexShaderEnable, this));
+}
+
+LLFloaterPreferenceGraphicsAdvanced::~LLFloaterPreferenceGraphicsAdvanced()
+{
+}
+
 LLFloaterPreferenceProxy::LLFloaterPreferenceProxy(const LLSD& key)
 	: LLFloater(key),
 	  mSocksSettingsDirty(false)
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 10087f8aa3..cc3c85e340 100755
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -117,10 +117,10 @@ protected:
 	// callback for defaults
 	void setHardwareDefaults();
 	void setRecommended();
-	// callback for when client turns on shaders
-	void onVertexShaderEnable();
 	// callback for when client turns on impostors
 	void onAvatarImpostorsEnable();
+		// callback for when client turns on shaders
+	void onVertexShaderEnable();
 
 	// callback for commit in the "Single click on land" and "Double click on land" comboboxes.
 	void onClickActionChange();
@@ -128,7 +128,7 @@ protected:
 	void updateClickActionSettings();
 	// updates click/double-click action controls depending on values from settings.xml
 	void updateClickActionControls();
-	
+
 	// This function squirrels away the current values of the controls so that
 	// cancel() can restore them.	
 	void saveSettings();
@@ -155,15 +155,11 @@ public:
 	void enableHistory();
 	void setPersonalInfo(const std::string& visibility, bool im_via_email);
 	void refreshEnabledState();
-	void disableUnavailableSettings();
 	void onCommitWindowedMode();
 	void refresh();	// Refresh enable/disable
 	// if the quality radio buttons are changed
 	void onChangeQuality(const LLSD& data);
 	
-	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
-	void updateImpostorsText(LLSliderCtrl* ctrl, LLTextBox* text_box);
-	void updateMaximumArcText(LLSliderCtrl* ctrl, LLTextBox* text_box);
 	void refreshUI();
 
 	void onCommitParcelMediaAutoPlayEnable();
@@ -177,6 +173,7 @@ public:
 	void onClickPermsDefault();
 	void onClickAutoReplace();
 	void onClickSpellChecker();
+	void onClickAdvanced();
 	void applyUIColor(LLUICtrl* ctrl, const LLSD& param);
 	void getUIColor(LLUICtrl* ctrl, const LLSD& param);
 	void onLogChatHistorySaved();	
@@ -269,6 +266,24 @@ private:
 	void onPresetsListChange();
 };
 
+class LLFloaterPreferenceGraphicsAdvanced : public LLFloater
+{
+public: 
+	LLFloaterPreferenceGraphicsAdvanced(const LLSD& key);
+	~LLFloaterPreferenceGraphicsAdvanced();
+
+	void disableUnavailableSettings();
+	void refreshEnabledGraphics();
+	void refreshEnabledState();
+	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+	void updateImpostorsText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+	void updateMaximumArcText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+	void draw();
+	void refresh();
+	// callback for when client turns on shaders
+	void onVertexShaderEnable();
+};
+
 class LLFloaterPreferenceProxy : public LLFloater
 {
 public: 
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 5ab7551849..5143d2c2ff 100755
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -274,6 +274,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("perms_default", "floater_perms_default.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPermsDefault>);
 	LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
+	LLFloaterReg::add("prefs_graphics_advanced", "floater_preferences_graphics_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceGraphicsAdvanced>);
 	LLFloaterReg::add("prefs_proxy", "floater_preferences_proxy.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceProxy>);
 	LLFloaterReg::add("prefs_spellchecker_import", "floater_spellcheck_import.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSpellCheckerImport>);
 	LLFloaterReg::add("prefs_translation", "floater_translation_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTranslationSettings>);
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..981a30b436
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,862 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  height="680"
+  layout="topleft"
+  name="prefs_graphics_advanced"
+  help_topic="Preferences_Graphics_Advanced"
+  single_instance="true"
+  save_rect="true"
+  title="ADVANCED GRAPHICS PREFERENCES"
+  width="450">
+
+<!-- This block shows Advanced Settings -->
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Reset all to recommended settings"
+    layout="topleft"
+    left="10"
+    name="Defaults"
+    top="5"
+    width="250">
+    <button.commit_callback
+      function="Pref.HardwareDefaults" />
+  </button>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="GeneralText"
+    top_delta="35"
+    left="5"
+    width="128">
+     General
+  </text>
+
+  <slider
+    control_name="RenderFarClip"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="8"
+    initial_value="160"
+    label="Draw distance:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="64"
+    max_val="512"
+    name="DrawDistance"
+    top_delta="16"
+    width="330" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="DrawDistanceMeterText2"
+    top_delta="0"
+    left_delta="330"
+    width="102">
+      m
+  </text> 
+
+  <slider
+    control_name="RenderMaxPartCount"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="256"
+    initial_value="4096"
+    label="Max. particle count:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    max_val="8192"
+    name="MaxParticleCount"
+    top_delta="16"
+    width="336" />
+
+  <slider
+    control_name="RenderGlowResolutionPow"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="8"
+    label="Post process quality:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="8"
+    max_val="9"
+    name="RenderPostProcess"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="PostProcessText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="PostProcessText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="AvatarText"
+    top_delta="20"
+    left="5"
+    width="128">
+     Avatar
+  </text>
+
+  <slider
+    control_name="MaximumARC"
+    follows="left|top"
+    height="16"
+    initial_value="101"
+    increment="1"
+    label="Maximum ARC:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="1"
+    max_val="101"
+    name="MaximumARC"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="MaximumARCText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="304"
+    text_readonly_color="LabelDisabledColor"
+    name="MaximumARCText"
+    width="128">
+       0
+  </text>
+
+  <slider
+    control_name="RenderAvatarMaxVisible"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="12"
+    label="Max. # of non-impostors:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="1"
+    max_val="66"
+    name="MaxNumberAvatarDrawn"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="ImpostorsText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="304"
+    text_readonly_color="LabelDisabledColor"
+    name="ImpostorsText"
+    width="128">
+       0
+  </text>
+
+  <slider
+    control_name="RenderAvatarLODFactor"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Detail:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="AvatarMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="AvatarMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="AvatarMeshDetailText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+     Low
+  </text>
+
+  <slider
+    control_name="RenderAvatarPhysicsLODFactor"
+    follows="left|top"
+    height="16"
+    initial_value="100"
+    increment=".05"
+    label="Physics:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="AvatarPhysicsDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="AvatarPhysicsDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="304"
+    name="AvatarPhysicsDetailText"
+    width="128">
+       Low
+  </text>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ShadersText"
+    top_delta="20"
+    left="5"
+    width="128">
+     Shaders
+  </text>
+
+  <check_box
+    control_name="RenderTransparentWater"
+    height="16"
+    initial_value="true"
+    label="Transparent Water"
+    layout="topleft"
+    left="30"
+    name="TransparentWater"
+    top_delta="16"
+    width="300" />
+
+  <check_box
+    control_name="RenderObjectBump"
+    height="16"
+    initial_value="true"
+    label="Bump mapping and shiny"
+    layout="topleft"
+    left="30"
+    name="BumpShiny"
+    top_delta="16"
+    width="300">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderLocalLights"
+    height="16"
+    initial_value="true"
+    label="Local Lights"
+    layout="topleft"
+    left="30"
+    name="LocalLights"
+    top_delta="16"
+    width="300" />
+
+  <check_box
+    control_name="VertexShaderEnable"
+    height="16"
+    initial_value="true"
+    label="Basic shaders"
+    layout="topleft"
+    left="30"
+    name="BasicShaders"
+    tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
+    top_delta="16"
+    width="300">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <slider
+    control_name="RenderTerrainDetail"
+    follows="left|top"
+    height="16"
+    label="Terrain Detail:"
+    label_width="165"
+    layout="topleft"
+    left="50"
+    show_text="false"
+    initial_value="0"
+    increment="1"
+    min_val="0"
+    max_val="1"
+    name="TerrainDetail"
+    top_delta="16"
+    width="280" >
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="TerrainDetail" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="284"
+    name="TerrainDetailText"
+    text_readonly_color="LabelDisabledColor"
+    width="128">
+       Low
+  </text>
+
+  <check_box
+    control_name="RenderAvatarVP"
+    height="16"
+    initial_value="true"
+    label="Avatar Hardware skinning"
+    layout="topleft"
+    left="50"
+    name="AvatarVertexProgram"
+    top_delta="16"
+    width="280">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderAvatarCloth"
+    height="16"
+    initial_value="true"
+    label="Avatar cloth"
+    layout="topleft"
+    left="50"
+    name="AvatarCloth"
+    top_delta="16"
+    width="280" />
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ReflectionsText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="16"
+    left="50"
+    width="128">
+       Water Reflections:
+  </text>
+  <combo_box
+    control_name="RenderReflectionDetail"
+    height="18"
+    layout="topleft"
+    left_delta="170"
+    top_delta="0"
+    name="Reflections"
+    width="150">
+      <combo_box.item
+        label="Minimal"
+        name="0"
+        value="0"/>
+      <combo_box.item
+        label="Terrain and trees"
+        name="1"
+        value="1"/>
+      <combo_box.item
+        label="All static objects"
+        name="2"
+        value="2"/>
+      <combo_box.item
+        label="All avatars and objects"
+        name="3"
+        value="3"/>
+      <combo_box.item
+        label="Everything"
+        name="4"
+        value="4"/>
+  </combo_box>
+
+  <check_box
+    control_name="WindLightUseAtmosShaders"
+    height="16"
+    initial_value="true"
+    label="Atmospheric shaders"
+    layout="topleft"
+    left="50"
+    name="WindLightUseAtmosShaders"
+    top_delta="16"
+    width="280">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <slider
+    control_name="WLSkyDetail"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="8"
+    initial_value="160"
+    label="Sky:"
+    label_width="145"
+    layout="topleft"
+    left="70"
+    min_val="16"
+    max_val="128"
+    name="SkyMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="260">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="SkyMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left_delta="264"
+    name="SkyMeshDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="0"
+    width="128">
+       Low
+  </text>
+
+  <check_box
+    control_name="RenderDeferred"
+    height="16"
+    initial_value="true"
+    label="Advanced Lighting Model"
+    layout="topleft"
+    left="70"
+    name="UseLightShaders"
+    top_delta="16"
+    width="260">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderDeferredSSAO"
+    height="16"
+    initial_value="true"
+    label="Ambient Occlusion"
+    layout="topleft"
+    left="90"
+    name="UseSSAO"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderDepthOfField"
+    height="16"
+    initial_value="true"
+    label="Depth of Field"
+    layout="topleft"
+    left="90"
+    name="UseDoF"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="90"
+    name="RenderShadowDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="16"
+    width="128">
+      Shadows:
+  </text>
+  <combo_box
+   control_name="RenderShadowDetail"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0" 
+   name="ShadowDetail"
+   width="150">
+     <combo_box.item
+       label="None"
+       name="0"
+       value="0"/>
+     <combo_box.item
+       label="Sun/Moon"
+       name="1"
+       value="1"/>
+     <combo_box.item
+       label="Sun/Moon + Projectors"
+       name="2"
+       value="2"/>
+  </combo_box>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="AvatarText"
+    top_delta="20"
+    left="5"
+    width="128">
+     Mesh
+  </text>
+
+  <slider
+    control_name="RenderTerrainLODFactor"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Terrain Mesh Detail:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="1"
+    max_val="2"
+    name="TerrainMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="TerrainMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="TerrainMeshDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <slider
+    control_name="RenderTreeLODFactor"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Trees:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="TreeMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="TreeMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="TreeMeshDetailText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <slider
+    control_name="RenderVolumeLODFactor"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Objects:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    max_val="2"
+    name="ObjectMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="ObjectMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ObjectMeshDetailText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <slider
+    control_name="RenderFlexTimeFactor"
+    follows="left|top"
+    height="16"
+    initial_value="160"
+    label="Flexiprims:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="FlexibleMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+   function="Pref.UpdateSliderText"
+      parameter="FlexibleMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="FlexibleMeshDetailText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ShadersText"
+    top_delta="20"
+    left="5"
+    width="128">
+     Hardware
+  </text>
+
+  <slider
+    control_name="TextureMemory"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="16"
+    initial_value="32"
+    label="Texture Memory (MB):"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    max_val="4096"
+    name="GraphicsCardTextureMemory"
+    tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
+    top_delta="16"
+    width="335" />
+
+  <slider
+    control_name="RenderFogRatio"
+    follows="left|top"
+    height="16"
+    initial_value="4"
+    decimal_digits="1"
+    label="Fog Distance Ratio:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="fog"
+    min_val="0.5"
+    max_val="10"
+    increment="0.1"
+    top_delta="16"
+    width="332" />
+
+  <slider
+    control_name="RenderGamma"
+    follows="left|top"
+    height="16"
+    initial_value="1"
+    decimal_digits="2"
+    label="Gamma:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="gamma"
+    min_val="0"
+    max_val="2"
+    increment="0.01"
+    top_delta="16"
+    width="332" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="30"
+    name="(brightness, lower is brighter)"
+    top_delta="16"
+    width="230">
+      (0 = default brightness, lower = brighter)
+  </text>
+
+  <check_box
+    control_name="RenderAnisotropic"
+    height="16"
+    label="Anisotropic Filtering (slower when enabled)"
+    layout="topleft"
+    left="30"
+    name="ani"
+    top_delta="16"
+    width="256" />
+
+  <check_box
+    control_name="RenderVBOEnable"
+    height="16"
+    initial_value="true"
+    label="Enable OpenGL Vertex Buffer Objects"
+    layout="topleft"
+    left="30"
+    top_delta="16"
+    name="vbo"
+    tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+    width="315" />
+
+  <check_box
+    control_name="RenderCompressTextures"
+    height="16"
+    initial_value="true"
+    label="Enable Texture Compression (requires restart)"
+    layout="topleft"
+    left="30"
+    top_delta="16"
+    name="texture compression"
+    tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
+    width="315" />
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="20"
+    layout="topleft"
+    left="30"
+    name="antialiasing label"
+    top_delta="20"
+    width="100">
+      Antialiasing:
+  </text>
+  <combo_box
+    control_name="RenderFSAASamples"
+    height="20"
+    initial_value="false"
+    label="Antialiasing"
+    layout="topleft"
+    left_pad="40"
+    name="fsaa"
+    top_delta="0"
+    width="90">
+    <combo_box.item
+      label="Disabled"
+      name="FSAADisabled"
+      value="0" />
+    <combo_box.item
+      label="2x"
+      name="2x"
+      value="2" />
+    <combo_box.item
+     label="4x"
+     name="4x"
+     value="4" />
+    <combo_box.item
+     label="8x"
+     name="8x"
+     value="8" />
+    <combo_box.item
+     label="16x"
+     name="16x"
+     value="16" />
+  </combo_box>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left_pad="10"
+    name="antialiasing restart"
+    top_delta="0"
+    width="190">
+     (requires viewer restart)
+  </text>
+<!-- End of Advanced Settings block -->
+
+</floater>
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 756c765bbd..5d4bfdd17f 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -10,7 +10,6 @@
  top="1"
  width="517">
 
-<!-- This block is always displayed -->
   <text
     follows="top|left|right"
     height="16"
@@ -229,1002 +228,105 @@
       function="Pref.QualityPerformance"/>
   </slider>
 
-<!--End of block that is always displayed -->
-
-  <tab_container
-    follows="left|top"
-    layout="topleft"
-    height="385"
-    halign="center"
-    left="0"
-    name="PreferencesGraphicsTabs"
-    tab_max_width="300"
-    tab_min_width="40"
-    tab_position="top"
-    tab_height="25"
-    top="85"
-    width="517">
-
 <!-- This block shows Basic Settings -->
-    <panel
-      border="false"
-      follows="all"
-      label="BASIC"
-      layout="topleft"
-      mouse_opaque="false"
-      name="Basic"
-      top="10"
-      width="517">
-
-      <button
-        follows="top|left"
-        height="23"
-        label="Reset all to recommended settings"
-        layout="topleft"
-        left="5"
-        name="Defaults"
-        top_delta="5"
-        width="250">
-        <button.commit_callback
-          function="Pref.HardwareDefaults" />
-      </button>
 
-      <slider
-        control_name="RenderFarClip"
-        decimal_digits="0"
-        follows="left|top"
-        height="16"
-        increment="8"
-        initial_value="160"
-        label="Draw distance:"
-        label_width="90"
-        layout="topleft"
-        left="30"
-        min_val="64"
-        max_val="512"
-        name="DrawDistance"
-        top_delta="40"
-        width="330" />
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="12"
-        layout="topleft"
-        left_delta="330"
-        name="DrawDistanceMeterText2"
-        top_delta="0"
-        width="128">
-         m
-      </text>
+  <button
+    follows="top|left"
+    height="23"
+    label="Reset all to recommended settings"
+    layout="topleft"
+    left="5"
+    name="Defaults"
+    top_delta="30"
+    width="250">
+    <button.commit_callback
+      function="Pref.HardwareDefaults" />
+  </button>
 
-      <check_box
-        control_name="WindLightUseAtmosShaders"
-        height="16"
-        initial_value="true"
-        label="Atmospheric shaders"
-        layout="topleft"
-        left="30"
-        name="WindLightUseAtmosShaders"
-        top_delta="20"
-        width="280">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
+  <slider
+    control_name="RenderFarClip"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="8"
+    initial_value="160"
+    label="Draw distance:"
+    label_width="90"
+    layout="topleft"
+    left="30"
+    min_val="64"
+    max_val="512"
+    name="DrawDistance"
+    top_delta="40"
+    width="330" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left_delta="330"
+    name="DrawDistanceMeterText2"
+    top_delta="0"
+    width="128">
+     m
+  </text>
 
-      <check_box
-        control_name="RenderDeferred"
-        height="16"
-        initial_value="true"
-        label="Advanced Lighting Model"
-        layout="topleft"
-        left="50"
-        name="UseLightShaders"
-        top_delta="20"
-        width="256">
-        <check_box.commit_callback
-          function="Pref.VertexShaderEnable" />
-      </check_box>
+  <check_box
+    control_name="WindLightUseAtmosShaders"
+    height="16"
+    initial_value="true"
+    label="Atmospheric shaders"
+    layout="topleft"
+    left="30"
+    name="WindLightUseAtmosShaders"
+    top_delta="20"
+    width="280">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderDeferred"
+    height="16"
+    initial_value="true"
+    label="Advanced Lighting Model"
+    layout="topleft"
+    left="50"
+    name="UseLightShaders"
+    top_delta="20"
+    width="256">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
 
-    </panel>
 <!-- End of Basic Settings block -->
 
-<!-- This block shows Advanced Settings -->
-    <panel
-      border="false"
-      follows="all"
-      label="ADVANCED"
-      layout="topleft"
-      mouse_opaque="false"
-      name="Advanced"
-      top_delta="10"
-      width="517">
-
-      <scroll_container
-        follows="top|left"
-        height="255"
-        label="CustomGraphics"
-        layout="topleft"
-        left="5"
-        name="CustomGraphics Scroll"
-        reserve_scroll_corner="true"
-        top_delta="20"
-        width="500">
-
-        <panel
-          border="false"
-          follows="top|left"
-          height="700"
-          label="CustomGraphics"
-          layout="topleft"
-          left="5"
-          name="Advanced Panel"
-          top_delta="0"
-          width="485">
-
-          <button
-            follows="top|left"
-            height="23"
-            label="Reset all to recommended settings"
-            layout="topleft"
-            left="0"
-            name="Defaults"
-            top="0"
-            width="250">
-            <button.commit_callback
-              function="Pref.HardwareDefaults" />
-          </button>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="GeneralText"
-            top_delta="25"
-            left="5"
-            width="128">
-             General
-          </text>
-
-          <slider
-            control_name="RenderFarClip"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="8"
-            initial_value="160"
-            label="Draw distance:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="64"
-            max_val="512"
-            name="DrawDistance"
-            top_delta="16"
-            width="330" />
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="DrawDistanceMeterText2"
-            top_delta="0"
-            left_delta="330"
-            width="102">
-              m
-          </text> 
-
-          <slider
-            control_name="RenderMaxPartCount"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="256"
-            initial_value="4096"
-            label="Max. particle count:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            max_val="8192"
-            name="MaxParticleCount"
-            top_delta="16"
-            width="336" />
-
-          <slider
-            control_name="RenderGlowResolutionPow"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="1"
-            initial_value="8"
-            label="Post process quality:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="8"
-            max_val="9"
-            name="RenderPostProcess"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="PostProcessText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="PostProcessText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               Low
-          </text>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="AvatarText"
-            top_delta="20"
-            left="5"
-            width="128">
-             Avatar
-          </text>
-
-          <slider
-            control_name="MaximumARC"
-            follows="left|top"
-            height="16"
-            initial_value="101"
-            increment="1"
-            label="Maximum ARC:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="1"
-            max_val="101"
-            name="MaximumARC"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="MaximumARCText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="304"
-            text_readonly_color="LabelDisabledColor"
-            name="MaximumARCText"
-            width="128">
-               0
-          </text>
-
-          <slider
-            control_name="RenderAvatarMaxVisible"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="1"
-            initial_value="12"
-            label="Max. # of non-impostors:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="1"
-            max_val="66"
-            name="MaxNumberAvatarDrawn"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="ImpostorsText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="304"
-            text_readonly_color="LabelDisabledColor"
-            name="ImpostorsText"
-            width="128">
-               0
-          </text>
-
-          <slider
-            control_name="RenderAvatarLODFactor"
-            follows="left|top"
-            height="16"
-            increment="0.125"
-            initial_value="160"
-            label="Detail:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="AvatarMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="AvatarMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="AvatarMeshDetailText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-             Low
-          </text>
-
-          <slider
-            control_name="RenderAvatarPhysicsLODFactor"
-            follows="left|top"
-            height="16"
-            initial_value="100"
-            increment=".05"
-            label="Physics:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="AvatarPhysicsDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="AvatarPhysicsDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="304"
-            name="AvatarPhysicsDetailText"
-            width="128">
-               Low
-          </text>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="ShadersText"
-            top_delta="20"
-            left="5"
-            width="128">
-             Shaders
-          </text>
-
-          <check_box
-            control_name="RenderTransparentWater"
-            height="16"
-            initial_value="true"
-            label="Transparent Water"
-            layout="topleft"
-            left="30"
-            name="TransparentWater"
-            top_delta="16"
-            width="300" />
-
-          <check_box
-            control_name="RenderObjectBump"
-            height="16"
-            initial_value="true"
-            label="Bump mapping and shiny"
-            layout="topleft"
-            left="30"
-            name="BumpShiny"
-            top_delta="16"
-            width="300">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <check_box
-            control_name="RenderLocalLights"
-            height="16"
-            initial_value="true"
-            label="Local Lights"
-            layout="topleft"
-            left="30"
-            name="LocalLights"
-            top_delta="16"
-            width="300" />
-
-          <check_box
-            control_name="VertexShaderEnable"
-            height="16"
-            initial_value="true"
-            label="Basic shaders"
-            layout="topleft"
-            left="30"
-            name="BasicShaders"
-            tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
-            top_delta="16"
-            width="300">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <slider
-            control_name="RenderTerrainDetail"
-            follows="left|top"
-            height="16"
-            label="Terrain Detail:"
-            label_width="165"
-            layout="topleft"
-            left="50"
-            show_text="false"
-            initial_value="0"
-            increment="1"
-            min_val="0"
-            max_val="1"
-            name="TerrainDetail"
-            top_delta="16"
-            width="280" >
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="TerrainDetail" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            top_delta="0"
-            left_delta="284"
-            name="TerrainDetailText"
-            text_readonly_color="LabelDisabledColor"
-            width="128">
-               Low
-          </text>
-
-          <check_box
-            control_name="RenderAvatarVP"
-            height="16"
-            initial_value="true"
-            label="Avatar Hardware skinning"
-            layout="topleft"
-            left="50"
-            name="AvatarVertexProgram"
-            top_delta="16"
-            width="280">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <check_box
-            control_name="RenderAvatarCloth"
-            height="16"
-            initial_value="true"
-            label="Avatar cloth"
-            layout="topleft"
-            left="50"
-            name="AvatarCloth"
-            top_delta="16"
-            width="280" />
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="ReflectionsText"
-            text_readonly_color="LabelDisabledColor"
-            top_delta="16"
-            left="50"
-            width="128">
-               Water Reflections:
-          </text>
-          <combo_box
-            control_name="RenderReflectionDetail"
-            height="18"
-            layout="topleft"
-            left_delta="170"
-            top_delta="0"
-            name="Reflections"
-            width="150">
-              <combo_box.item
-                label="Minimal"
-                name="0"
-                value="0"/>
-              <combo_box.item
-                label="Terrain and trees"
-                name="1"
-                value="1"/>
-              <combo_box.item
-                label="All static objects"
-                name="2"
-                value="2"/>
-              <combo_box.item
-                label="All avatars and objects"
-                name="3"
-                value="3"/>
-              <combo_box.item
-                label="Everything"
-                name="4"
-                value="4"/>
-          </combo_box>
-
-          <check_box
-            control_name="WindLightUseAtmosShaders"
-            height="16"
-            initial_value="true"
-            label="Atmospheric shaders"
-            layout="topleft"
-            left="50"
-            name="WindLightUseAtmosShaders2"
-            top_delta="16"
-            width="280">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <slider
-            control_name="WLSkyDetail"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="8"
-            initial_value="160"
-            label="Sky:"
-            label_width="145"
-            layout="topleft"
-            left="70"
-            min_val="16"
-            max_val="128"
-            name="SkyMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="260">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="SkyMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            left_delta="264"
-            name="SkyMeshDetailText"
-            text_readonly_color="LabelDisabledColor"
-            top_delta="0"
-            width="128">
-               Low
-          </text>
-
-          <check_box
-            control_name="RenderDeferred"
-            height="16"
-            initial_value="true"
-            label="Advanced Lighting Model"
-            layout="topleft"
-            left="70"
-            name="UseLightShaders2"
-            top_delta="16"
-            width="260">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <check_box
-            control_name="RenderDeferredSSAO"
-            height="16"
-            initial_value="true"
-            label="Ambient Occlusion"
-            layout="topleft"
-            left="90"
-            name="UseSSAO"
-            top_delta="16"
-            width="240">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <check_box
-            control_name="RenderDepthOfField"
-            height="16"
-            initial_value="true"
-            label="Depth of Field"
-            layout="topleft"
-            left="90"
-            name="UseDoF"
-            top_delta="16"
-            width="240">
-            <check_box.commit_callback
-              function="Pref.VertexShaderEnable" />
-          </check_box>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            left="90"
-            name="RenderShadowDetailText"
-            text_readonly_color="LabelDisabledColor"
-            top_delta="16"
-            width="128">
-              Shadows:
-          </text>
-          <combo_box
-           control_name="RenderShadowDetail"
-           height="18"
-           layout="topleft"
-           left_delta="130"
-           top_delta="0" 
-           name="ShadowDetail"
-           width="150">
-             <combo_box.item
-               label="None"
-               name="0"
-               value="0"/>
-             <combo_box.item
-               label="Sun/Moon"
-               name="1"
-               value="1"/>
-             <combo_box.item
-               label="Sun/Moon + Projectors"
-               name="2"
-               value="2"/>
-          </combo_box>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="AvatarText"
-            top_delta="20"
-            left="5"
-            width="128">
-             Mesh
-          </text>
-
-          <slider
-            control_name="RenderTerrainLODFactor"
-            follows="left|top"
-            height="16"
-            increment="0.125"
-            initial_value="160"
-            label="Terrain Mesh Detail:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            min_val="1"
-            max_val="2"
-            name="TerrainMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="TerrainMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="TerrainMeshDetailText"
-            text_readonly_color="LabelDisabledColor"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               Low
-          </text>
-
-          <slider
-            control_name="RenderTreeLODFactor"
-            follows="left|top"
-            height="16"
-            increment="0.125"
-            initial_value="160"
-            label="Trees:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="TreeMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="TreeMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="TreeMeshDetailText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               Low
-          </text>
-
-          <slider
-            control_name="RenderVolumeLODFactor"
-            follows="left|top"
-            height="16"
-            increment="0.125"
-            initial_value="160"
-            label="Objects:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            max_val="2"
-            name="ObjectMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-              function="Pref.UpdateSliderText"
-              parameter="ObjectMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="ObjectMeshDetailText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               Low
-          </text>
-
-          <slider
-            control_name="RenderFlexTimeFactor"
-            follows="left|top"
-            height="16"
-            initial_value="160"
-            label="Flexiprims:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="FlexibleMeshDetail"
-            show_text="false"
-            top_delta="16"
-            width="300">
-            <slider.commit_callback
-	          function="Pref.UpdateSliderText"
-              parameter="FlexibleMeshDetailText" />
-          </slider>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="FlexibleMeshDetailText"
-            top_delta="0"
-            left_delta="304"
-            width="128">
-               Low
-          </text>
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            name="ShadersText"
-            top_delta="20"
-            left="5"
-            width="128">
-             Hardware
-          </text>
-
-          <slider
-            control_name="TextureMemory"
-            decimal_digits="0"
-            follows="left|top"
-            height="16"
-            increment="16"
-            initial_value="32"
-            label="Texture Memory (MB):"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            max_val="4096"
-            name="GraphicsCardTextureMemory"
-            tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
-            top_delta="16"
-            width="335" />
-
-          <slider
-            control_name="RenderFogRatio"
-            follows="left|top"
-            height="16"
-            initial_value="4"
-            decimal_digits="1"
-            label="Fog Distance Ratio:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="fog"
-            min_val="0.5"
-            max_val="10"
-            increment="0.1"
-            top_delta="16"
-            width="332" />
-
-          <slider
-            control_name="RenderGamma"
-            follows="left|top"
-            height="16"
-            initial_value="1"
-            decimal_digits="2"
-            label="Gamma:"
-            label_width="185"
-            layout="topleft"
-            left="30"
-            name="gamma"
-            min_val="0"
-            max_val="2"
-            increment="0.01"
-            top_delta="16"
-            width="332" />
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            left="30"
-            name="(brightness, lower is brighter)"
-            top_delta="16"
-            width="230">
-              (0 = default brightness, lower = brighter)
-          </text>
-
-          <check_box
-            control_name="RenderAnisotropic"
-            height="16"
-            label="Anisotropic Filtering (slower when enabled)"
-            layout="topleft"
-            left="30"
-            name="ani"
-            top_delta="16"
-            width="256" />
-
-          <check_box
-            control_name="RenderVBOEnable"
-            height="16"
-            initial_value="true"
-            label="Enable OpenGL Vertex Buffer Objects"
-            layout="topleft"
-            left="30"
-            top_delta="16"
-            name="vbo"
-            tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
-            width="315" />
-
-          <check_box
-            control_name="RenderCompressTextures"
-            height="16"
-            initial_value="true"
-            label="Enable Texture Compression (requires restart)"
-            layout="topleft"
-            left="30"
-            top_delta="16"
-            name="texture compression"
-            tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
-            width="315" />
-
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="20"
-            layout="topleft"
-            left="30"
-            name="antialiasing label"
-            top_delta="20"
-            width="100">
-              Antialiasing:
-          </text>
-          <combo_box
-            control_name="RenderFSAASamples"
-            height="20"
-            initial_value="false"
-            label="Antialiasing"
-            layout="topleft"
-            left_pad="40"
-            name="fsaa"
-            top_delta="0"
-            width="90">
-            <combo_box.item
-              label="Disabled"
-              name="FSAADisabled"
-              value="0" />
-            <combo_box.item
-              label="2x"
-              name="2x"
-              value="2" />
-            <combo_box.item
-             label="4x"
-             name="4x"
-             value="4" />
-            <combo_box.item
-             label="8x"
-             name="8x"
-             value="8" />
-            <combo_box.item
-             label="16x"
-             name="16x"
-             value="16" />
-          </combo_box>
-          <text
-            type="string"
-            length="1"
-            follows="left|top"
-            height="16"
-            layout="topleft"
-            left_pad="10"
-            name="antialiasing restart"
-            top_delta="0"
-            width="190">
-             (requires viewer restart)
-          </text>
-        </panel>
-      </scroll_container>
-    </panel>
-<!-- End of Advanced Settings block -->
+  <button
+    follows="left|bottom"
+    height="23"
+    label="Advanced Settings..."
+    layout="topleft"
+    left="10"
+    name="AdvancedSettings"
+    top_delta="60"
+    width="200">
+    <button.commit_callback
+      function="Pref.Advanced"
+      parameter="advanced" />
+  </button>
 
-    <button
-      follows="left|bottom"
-      height="23"
-      label="Save settings as a preset..."
-      layout="topleft"
-      left="10"
-      name="PrefSaveButton"
-      top="295"
-      width="250">
-      <button.commit_callback
-        function="Pref.PrefSave"
-        parameter="graphic" />
-    </button>
-  </tab_container>
+  <button
+    follows="left|bottom"
+    height="23"
+    label="Save settings as a preset..."
+    layout="topleft"
+    left="10"
+    name="PrefSaveButton"
+    top="295"
+    width="200">
+    <button.commit_callback
+      function="Pref.PrefSave"
+      parameter="graphic" />
+  </button>
 </panel>
-- 
cgit v1.3