From 5a36450e01511623b5ff1fe54019d1e657196773 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 9 Jun 2014 06:54:53 -0400
Subject: [PATCH] Allow multi-select for participant lists, for multi-user
 operations via right click menu.

---
 indra/newview/llparticipantlist.cpp                             | 2 +-
 .../newview/skins/default/xui/en-us/floater_active_speakers.xml | 2 +-
 .../newview/skins/default/xui/en-us/panel_speaker_controls.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index 86db29ccb..96a9940a4 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -140,7 +140,7 @@ void LLParticipantList::handleSpeakerSelect()
 {
 	const LLUUID& speaker_id = mAvatarList->getValue().asUUID();
 	LLPointer<LLSpeaker> selected_speakerp = mSpeakerMgr->findSpeaker(speaker_id);
-	if (speaker_id.isNull() || selected_speakerp.isNull())
+	if (speaker_id.isNull() || selected_speakerp.isNull() || mAvatarList->getNumSelected() != 1)
 	{
 		// Disable normal controls
 		if (LLView* view = findChild<LLView>("mute_btn"))
diff --git a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
index 845f579a4..cfb04e08f 100644
--- a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
@@ -8,7 +8,7 @@
     <layout_panel mouse_opaque="false" auto_resize="true" user_resize="false" name="active_speakers_panel" height="232">
       <scroll_list bottom="25" top="232" left="0" right="-1"
 		       draw_stripes="false" follows="all" can_resize="true" column_padding="0" draw_heading="true"
-		       multi_select="false" name="speakers_list" search_column="1" sort_column="2" menu_num="0">
+		       multi_select="true" name="speakers_list" search_column="1" sort_column="2" menu_num="0">
         <column name="icon_speaking_status" sort="speaking_status" width="20" />
         <column dynamicwidth="true" label="Name" name="speaker_name" />
         <column label="" name="speaking_status" width="0" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
index 54ba74117..29fdfd072 100644
--- a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
@@ -9,7 +9,7 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" min_height="100" name="moderate_chat_panel" top_delta="0" user_resize="false" visible="true" width="140">
-			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="speakers_list" right="140" search_column="1" sort_column="2" top="113" menu_num="0">
+			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="true" name="speakers_list" right="140" search_column="1" sort_column="2" top="113" menu_num="0">
 				<column name="icon_speaking_status" sort="speaking_status" width="20"/>
 				<column dynamicwidth="true" label="Name" name="speaker_name"/>
 				<column label="" name="speaking_status" width="0"/>