From b071a8cd7cac4fa1b90a85e31abb7685dfde69a8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 10 Jan 2016 20:01:55 +0100
Subject: [PATCH] FIRE-17630: Properly disable per-account settings backup list
 in preferences

---
 indra/newview/llfloaterpreference.cpp                         | 3 +++
 .../newview/skins/default/xui/en/panel_preferences_backup.xml | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d446918bea..a6ad55c3c6 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1029,6 +1029,9 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 		gSavedPerAccountSettings.getControl("FSMutedAvatarResponse")->getSignal()->connect(boost::bind(&LLFloaterPreference::onDoNotDisturbResponseChanged, this));
 		gSavedPerAccountSettings.getControl("FSAwayAvatarResponse")->getSignal()->connect(boost::bind(&LLFloaterPreference::onDoNotDisturbResponseChanged, this));
 		// </FS:Ansariel>
+
+		// <FS:Ansariel> FIRE-17630: Properly disable per-account settings backup list
+		getChildView("restore_per_account_disable_cover")->setVisible(FALSE);
 	}
 	gAgent.sendAgentUserInfoRequest();
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
index e5745e9611..11d8542036 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
@@ -180,7 +180,6 @@ Settings groups to be restored (backup will always save all):
      right="-1"
      height="180"
      draw_heading="true"
-     enabled_control="PerAccountSettingsFile"
      multi_select="false">
         <column label="" name="restore_per_account_files_check" width="16" />
         <column label="Per Account Files:" name="restore_per_account_files_label" />
@@ -249,8 +248,7 @@ Settings groups to be restored (backup will always save all):
      left="0"
      top="0"
      right="-1"
-     height="180"
-     invisibility_control="PerAccountSettingsFile" />
+     height="180"/>
 
     </layout_panel>