STORM-2082 Remove Apply button.

Add new control variable to track which preset is active.  Save settings
to active preset when clicking on Ok button.
Initial work to make pulldown operational. Still to do: add pretty icon for current preset.
Notifications do not appear when called from this panel.

1 files changed, 7 insertions, 2 deletions

diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp
index 01b25398dd..d92aaa5659 100644
--- a/indra/newview/llfloaterdeleteprefpreset.cpp
+++ b/indra/newview/llfloaterdeleteprefpreset.cpp
@@ -28,11 +28,11 @@
 
 #include "llfloaterdeleteprefpreset.h"
 
-#include "llpresetsmanager.h"
-
 #include "llbutton.h"
 #include "llcombobox.h"
 #include "llnotificationsutil.h"
+#include "llpresetsmanager.h"
+#include "llviewercontrol.h"
 
 LLFloaterDeletePrefPreset::LLFloaterDeletePrefPreset(const LLSD &key)
 :	LLFloater(key)
@@ -69,6 +69,11 @@ void LLFloaterDeletePrefPreset::onBtnDelete()
 
 	if (LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
 	{
+		if (name == gSavedSettings.getString("PresetGraphicActive"))
+		{
+			LLPresetsManager::getInstance()->savePreset(mSubdirectory, PRESETS_DEFAULT);
+		}
+
 		LLSD args;
 		args["NAME"] = name;
 		LLNotificationsUtil::add("PresetDeleted", args);