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

1 files changed, 4 insertions, 2 deletions

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);
 	}
 }