diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ebdb8aa2c5..1cffa03c06 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5437,6 +5437,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSUnlinkConfirmEnabled</key>
+    <map>
+      <key>Comment</key>
+      <string>Unlink confirmation dialog functionality enabled?</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>MinObjectsForUnlinkConfirm</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 4d0132f81a..7dcc395794 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -654,15 +654,25 @@ bool LLSelectMgr::linkObjects()
 
 bool LLSelectMgr::unlinkObjects()
 {
-	S32 min_objects_for_confirm = gSavedSettings.getS32("MinObjectsForUnlinkConfirm");
-	S32 unlink_object_count = mSelectedObjects->getObjectCount(); // clears out nodes with NULL objects
-	if (unlink_object_count >= min_objects_for_confirm
-		&& unlink_object_count > mSelectedObjects->getRootObjectCount())
+
+	// <FS:PP>
+	if (gSavedSettings.getBOOL("FSUnlinkConfirmEnabled"))
 	{
-		// total count > root count means that there are childer inside and that there are linksets that will be unlinked
-		LLNotificationsUtil::add("ConfirmUnlink", LLSD(), LLSD(), boost::bind(&LLSelectMgr::confirmUnlinkObjects, this, _1, _2));
-		return true;
+	// </FS:PP>
+
+		S32 min_objects_for_confirm = gSavedSettings.getS32("MinObjectsForUnlinkConfirm");
+		S32 unlink_object_count = mSelectedObjects->getObjectCount(); // clears out nodes with NULL objects
+		if (unlink_object_count >= min_objects_for_confirm
+			&& unlink_object_count > mSelectedObjects->getRootObjectCount())
+		{
+			// total count > root count means that there are childer inside and that there are linksets that will be unlinked
+			LLNotificationsUtil::add("ConfirmUnlink", LLSD(), LLSD(), boost::bind(&LLSelectMgr::confirmUnlinkObjects, this, _1, _2));
+			return true;
+		}
+
+	// <FS:PP>
 	}
+	// </FS:PP>
 
 	LLSelectMgr::getInstance()->sendDelink();
 	return true;
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 92f5adb1a4..779635c9dd 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2406,7 +2406,7 @@ Diese Aktion kann nicht rückgängig gemacht werden.
 		<usetemplate ignoretext="Vor dem Löschen von Objekten bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmUnlink">Soll das ausgewählte Objekt wirklich getrennt werden?
-		<usetemplate ignoretext="Vor dem Trennen von Objekten bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Trennen"/>
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Trennen"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Wählen Sie eine Missbrauchskategorie aus.
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 6ff3c02ad8..74ff1171f4 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
@@ -224,9 +224,7 @@
 		<text name="RotationStepText2" width="290">
 			Grad beschränken, falls „An Raster ausrichten“ deakt.
 		</text>
-		<text name="MinObjectsForUnlinkConfirmText1" width="275">
-			Trennen von Objekten bestehend aus mindestens
-		</text>
+		<check_box label="Trennen von Objekten bestehend aus mindestens" name="FSUnlinkConfirmEnabled" width="295"/>
 		<text name="MinObjectsForUnlinkConfirmText2">
 			Einzelobjekten bestätigen
 		</text>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e118562016..1abad2477a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6074,8 +6074,7 @@ You cannot undo this action.
     Do you really want to unlink the selected object?
     <tag>confirm</tag>
     <usetemplate
-     ignoretext="Confirm when unlinking a linkset"
-     name="okcancelignore"
+     name="okcancelbuttons"
      notext="Cancel"
      yestext="Unlink"/>
   </notification>
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 4f3d350537..5434bd450f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -1539,16 +1539,17 @@
          width="270">
           degrees, when not using 'snap to grid'
         </text>
-        <text
+        <check_box
          left="3"
          top_pad="8"
          follows="left|top"
          height="16"
-         name="MinObjectsForUnlinkConfirmText1"
-         width="310">
-          Show unlink confirmation dialog if linkset has minimum
-        </text>
+         label="Show unlink confirmation dialog if linkset has minimum"
+         name="FSUnlinkConfirmEnabled"
+         control_name="FSUnlinkConfirmEnabled"
+         width="325"/>
         <spinner
+         enabled_control="FSUnlinkConfirmEnabled"
          control_name="MinObjectsForUnlinkConfirm"
          decimal_digits="0"
          top_delta="-5"
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 1204ab78a1..0a9643f9b8 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2375,7 +2375,7 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
 	</notification>
 	<notification name="ConfirmUnlink">
 		選択したオブジェクトのリンクを本当に解除しますか？
-		<usetemplate ignoretext="リンクセットを解除する時には確認" name="okcancelignore" notext="取り消し" yestext="リンク解除"/>
+		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="リンク解除"/>
 	</notification>
 	<!--
 	<notification name="HelpReportAbuseEmailLL">
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 30da44aa6b..c085ad853c 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -2276,7 +2276,7 @@ Nie możesz tego cofnąć.
 	</notification>
 	<notification name="ConfirmUnlink">
 		Na pewno chcesz rozłączyć zaznaczony obiekt?
-		<usetemplate ignoretext="Potwierdź przed rozłączeniem obiektu" name="okcancelignore" notext="Anuluj" yestext="Rozłącz"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Rozłącz"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Wybierz kategorię dla tego raportu o nadużyciu.
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
index 4682fb3413..5482571980 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
@@ -201,9 +201,7 @@
         <text name="RotationStepText2">
           stopni, gdy 'przyciągaj do siatki' nie jest używane
         </text>
-        <text name="MinObjectsForUnlinkConfirmText1" width="365">
-          Pytaj o potwierdzenie przy rozłączaniu jeśli zbiór ma przynajmniej
-        </text>
+        <check_box label="Pytaj o potwierdzenie przy rozłączaniu jeśli zbiór ma przynajmniej" name="FSUnlinkConfirmEnabled" width="380"/>
         <text name="MinObjectsForUnlinkConfirmText2">
           części
         </text>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 2ca01a8bbd..b326ab5a97 100755
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -4973,9 +4973,9 @@ URL: [MEDIAURL]
 			<button name="Cancel" text="Отмена"/>
 		</form>
 	</notification>
-	<notification name="ConfirmUnlinkObjects">
+	<notification name="ConfirmUnlink">
 		Вы действительно хотите разъеденить выбранные объекты?
-		<usetemplate ignoretext="Подтвердить разъеденение выбранные объекты выбранных объектов" name="okcancelignore" notext="Отмена" yestext="Разъеденить"/>
+		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Разъеденить"/>
 	</notification>
 	<notification name="SnoozeDuration">
 		Время в секундах, чтобы отключить чат группы: