From b8555fe43e54e35eced101a95476a03c959eb45f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 7 Jul 2015 11:08:47 +0200
Subject: [PATCH] Allow DaD from legacy friend list to IM sessions

---
 .../skins/ansastorm/xui/en/panel_fs_contacts_friends.xml       | 1 +
 indra/newview/skins/default/xui/en/floater_fs_im_container.xml | 1 +
 .../newview/skins/default/xui/en/panel_fs_contacts_friends.xml | 1 +
 .../skins/firestorm/xui/en/panel_fs_contacts_friends.xml       | 1 +
 .../newview/skins/latency/xui/en/panel_fs_contacts_friends.xml | 1 +
 indra/newview/skins/vintage/xui/en/floater_fs_im_container.xml | 3 ++-
 .../newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml | 1 +
 7 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml
index 26e108ba17..03e67eda2f 100644
--- a/indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml
@@ -38,6 +38,7 @@
 	 draw_heading="true"
 	 heading_height="20"
 	 multi_select="true"
+	 content_type="Agents"
 	 name="friend_list">
 		<fs_scroll_list.column
 		 name="icon_online_status"
diff --git a/indra/newview/skins/default/xui/en/floater_fs_im_container.xml b/indra/newview/skins/default/xui/en/floater_fs_im_container.xml
index d956108733..b34f2eb63b 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_im_container.xml
@@ -21,6 +21,7 @@
      name="im_box_tab_container"
      tab_position="left"
      tab_drag_commit="true"
+     open_tabs_on_drag_and_drop="true"
      tab_width="115"
      tab_max_width = "115"
      tab_height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
index 20867621ef..995220fedb 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
@@ -37,6 +37,7 @@
      draw_heading="true"
 	 heading_height="20"
 	 multi_select="true"
+	 content_type="Agents"
      name="friend_list">
 		<fs_scroll_list.column
 		 name="icon_online_status"
diff --git a/indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml
index cce2183e63..f2c371be89 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml
@@ -37,6 +37,7 @@
      draw_heading="true"
 	 heading_height="20"
 	 multi_select="true"
+	 content_type="Agents"
      name="friend_list">
 		<fs_scroll_list.column
 		 image="legacy/ff_online_status_button.tga"
diff --git a/indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml
index cce2183e63..f2c371be89 100644
--- a/indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml
@@ -37,6 +37,7 @@
      draw_heading="true"
 	 heading_height="20"
 	 multi_select="true"
+	 content_type="Agents"
      name="friend_list">
 		<fs_scroll_list.column
 		 image="legacy/ff_online_status_button.tga"
diff --git a/indra/newview/skins/vintage/xui/en/floater_fs_im_container.xml b/indra/newview/skins/vintage/xui/en/floater_fs_im_container.xml
index 7c4ae2711d..8c397d0115 100644
--- a/indra/newview/skins/vintage/xui/en/floater_fs_im_container.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_fs_im_container.xml
@@ -16,12 +16,13 @@
     <tab_container
      follows="left|right|top|bottom"
      height="390"
-	 label_pad_left="10"
+     label_pad_left="10"
      layout="topleft"
      left="1"
      name="im_box_tab_container"
      tab_position="left"
      tab_drag_commit="true"
+     open_tabs_on_drag_and_drop="true"
      tab_width="115"
      tab_max_width = "115"
      tab_height="20"
diff --git a/indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml
index 5a3418c807..2a14aa2d8f 100644
--- a/indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml
@@ -27,6 +27,7 @@
      draw_heading="true"
 	 heading_height="20"
 	 multi_select="true"
+	 content_type="Agents"
      name="friend_list">
 		<fs_scroll_list.column
 		 image="legacy/ff_online_status_button.tga"