From 1d80eda28e5212938a33b8bc852b8122bd3ad312 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 4 May 2018 18:41:46 +0200
Subject: [PATCH] FIRE-22538: Add button to reset default upload folders

---
 indra/newview/fspanelprefs.cpp                        | 11 +++++++++++
 indra/newview/fspanelprefs.h                          |  2 ++
 .../default/xui/de/panel_preferences_firestorm.xml    |  1 +
 .../default/xui/en/panel_preferences_firestorm.xml    |  7 +++++++
 4 files changed, 21 insertions(+)

diff --git a/indra/newview/fspanelprefs.cpp b/indra/newview/fspanelprefs.cpp
index 0e3e0cba6d..15060d8462 100644
--- a/indra/newview/fspanelprefs.cpp
+++ b/indra/newview/fspanelprefs.cpp
@@ -67,6 +67,8 @@ BOOL FSPanelPrefs::postBuild()
 	getChild<LLUICtrl>("refresh_beams")->setCommitCallback(boost::bind(&FSPanelPrefs::refreshBeamLists, this));
 	getChild<LLUICtrl>("delete_beam")->setCommitCallback(boost::bind(&FSPanelPrefs::onBeamDelete, this));
 
+	getChild<LLUICtrl>("reset_default_folders")->setCommitCallback(boost::bind(&FSPanelPrefs::onResetDefaultFolders, this));
+
 	populateCloudCombo();
 	
 	LLTextureCtrl* tex_ctrl = getChild<LLTextureCtrl>("texture control");
@@ -102,11 +104,13 @@ void FSPanelPrefs::onOpen(const LLSD& key)
 				getChild<LLTextBox>("build_item_add_disp_rect_txt")->setTextArg("[ITEM]", getString("EmbeddedItemNotAvailable"));
 			}
 		}
+		getChild<LLUICtrl>("reset_default_folders")->setEnabled(TRUE);
 	}
 	else
 	{
 		getChild<LLCheckBoxCtrl>("FSBuildPrefs_EmbedItem")->setEnabled(FALSE);
 		getChild<LLTextBox>("build_item_add_disp_rect_txt")->setTextArg("[ITEM]", getString("EmbeddedItemNotLoggedIn"));
+		getChild<LLUICtrl>("reset_default_folders")->setEnabled(FALSE);
 	}
 }
 
@@ -299,3 +303,10 @@ void FSPanelPrefs::onDADEmbeddedItem(const LLUUID& item_id)
 	}
 }
 
+void FSPanelPrefs::onResetDefaultFolders()
+{
+	gSavedPerAccountSettings.getControl("ModelUploadFolder")->resetToDefault(true);
+	gSavedPerAccountSettings.getControl("TextureUploadFolder")->resetToDefault(true);
+	gSavedPerAccountSettings.getControl("SoundUploadFolder")->resetToDefault(true);
+	gSavedPerAccountSettings.getControl("AnimationUploadFolder")->resetToDefault(true);
+}
diff --git a/indra/newview/fspanelprefs.h b/indra/newview/fspanelprefs.h
index 0883ad6c2f..0ea56a1b38 100644
--- a/indra/newview/fspanelprefs.h
+++ b/indra/newview/fspanelprefs.h
@@ -58,6 +58,8 @@ private:
 
 	void onDADEmbeddedItem(const LLUUID& item_id);
 
+	void onResetDefaultFolders();
+
 	FSEmbeddedItemDropTarget*	mInvDropTarget;
 	std::string					mEmbeddedItem;
 };
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
index 68ac057f7d..b3121861df 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
@@ -273,6 +273,7 @@
 			Um einen Zielordner zu ändern, im Inventar auf den gewünschten Ordner rechts-klicken und
 „Als Standard nutzen für“ auswählen.
 		</text>
+		<button name="reset_default_folders" label="Standard-Ordner zurücksetzen"/>
 	</panel>
 </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 078d2f4eba..c4df000f84 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -1816,6 +1816,13 @@
         To change a destination folder, right click on it in inventory and choose
      "Use as default for"
       </text>
+      <button
+       name="reset_default_folders"
+       label="Reset default folders"
+       left="10"
+       top_pad="10"
+       width="200"
+       follows="left|top" />
     </panel>
 </tab_container>
 </panel>