From b0ecec1cae276b040313736a5935976a01e2b04f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 28 Jul 2020 12:32:06 +0200
Subject: [PATCH] Save graphic/camera presets floater: Save upon pressing enter
 when entering a new name

---
 indra/newview/llfloatersavecamerapreset.cpp          |  8 ++++++++
 indra/newview/llfloatersaveprefpreset.cpp            | 12 +++++++++++-
 .../default/xui/en/floater_save_camera_preset.xml    |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloatersavecamerapreset.cpp b/indra/newview/llfloatersavecamerapreset.cpp
index e790a5c89a..ce832d78db 100644
--- a/indra/newview/llfloatersavecamerapreset.cpp
+++ b/indra/newview/llfloatersavecamerapreset.cpp
@@ -54,6 +54,7 @@ BOOL LLFloaterSaveCameraPreset::postBuild()
 
 	mNameEditor = getChild<LLLineEditor>("preset_txt_editor");
 	mNameEditor->setKeystrokeCallback(boost::bind(&LLFloaterSaveCameraPreset::onPresetNameEdited, this), NULL);
+	mNameEditor->setCommitCallback(boost::bind(&LLFloaterSaveCameraPreset::onBtnSave, this)); // <FS:Ansariel> Save on pressing enter
 
 	mSaveButton = getChild<LLButton>("save");
 	mSaveButton->setCommitCallback(boost::bind(&LLFloaterSaveCameraPreset::onBtnSave, this));
@@ -99,6 +100,13 @@ void LLFloaterSaveCameraPreset::onBtnSave()
 	bool is_saving_new = mSaveRadioGroup->getSelectedIndex() == 0;
 	std::string name = is_saving_new ? mNameEditor->getText() : mPresetCombo->getSimple();
 
+	// <FS:Ansariel> Save on pressing enter
+	if (name.empty())
+	{
+		return;
+	}
+	// </FS:Ansariel>
+
 	if ((name == LLTrans::getString(PRESETS_DEFAULT)) || (name == PRESETS_DEFAULT))
 	{
 		LLNotificationsUtil::add("DefaultPresetNotSaved");
diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp
index 5f3cf9d95b..cf8aae0831 100644
--- a/indra/newview/llfloatersaveprefpreset.cpp
+++ b/indra/newview/llfloatersaveprefpreset.cpp
@@ -51,7 +51,10 @@ BOOL LLFloaterSavePrefPreset::postBuild()
 	}
 	
 	getChild<LLComboBox>("preset_combo")->setTextEntryCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
-	getChild<LLComboBox>("preset_combo")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
+	// <FS:Ansariel> Save on pressing enter
+	//getChild<LLComboBox>("preset_combo")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
+	getChild<LLComboBox>("preset_combo")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnSave, this));
+	// </FS:Ansariel>
 	getChild<LLButton>("save")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnSave, this));
 
 	getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnCancel, this));
@@ -86,6 +89,13 @@ void LLFloaterSavePrefPreset::onBtnSave()
 {
 	std::string name = mPresetCombo->getSimple();
 
+	// <FS:Ansariel> Save on pressing enter
+	if (name.empty())
+	{
+		return;
+	}
+	// </FS:Ansariel>
+
 	if ((name == LLTrans::getString(PRESETS_DEFAULT)) || (name == PRESETS_DEFAULT))
 	{
 		LLNotificationsUtil::add("DefaultPresetNotSaved");
diff --git a/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
index 447be5aa35..d85c11b2fb 100644
--- a/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
@@ -34,7 +34,7 @@
       value="1"/>
     </radio_group> 
     <line_editor
-     commit_on_focus_lost = "true"
+     commit_on_focus_lost="false"
      follows="top|left"
      height="23"
      layout="topleft"