Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow multi-select for participant lists, for multi-user operations via right click menu.

Browse Source
This commit is contained in:
Inusaito Sayori
2014-06-09 06:54:53 -04:00
parent 839f4eab7e
commit 5a36450e01
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llparticipantlist.cpp
View File

@@ -140,7 +140,7 @@ void LLParticipantList::handleSpeakerSelect()
{ {
const LLUUID& speaker_id = mAvatarList->getValue().asUUID(); const LLUUID& speaker_id = mAvatarList->getValue().asUUID();
LLPointer<LLSpeaker> selected_speakerp = mSpeakerMgr->findSpeaker(speaker_id); 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 // Disable normal controls
if (LLView* view = findChild<LLView>("mute_btn")) if (LLView* view = findChild<LLView>("mute_btn"))

2
indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
View File

@@ -8,7 +8,7 @@
<layout_panel mouse_opaque="false" auto_resize="true" user_resize="false" name="active_speakers_panel" height="232"> <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" <scroll_list bottom="25" top="232" left="0" right="-1"
draw_stripes="false" follows="all" can_resize="true" column_padding="0" draw_heading="true" 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 name="icon_speaking_status" sort="speaking_status" width="20" />
<column dynamicwidth="true" label="Name" name="speaker_name" /> <column dynamicwidth="true" label="Name" name="speaker_name" />
<column label="" name="speaking_status" width="0" /> <column label="" name="speaking_status" width="0" />

2
indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
View File

@@ -9,7 +9,7 @@
</combo_box> </combo_box>
</layout_panel> </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"> <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 name="icon_speaking_status" sort="speaking_status" width="20"/>
<column dynamicwidth="true" label="Name" name="speaker_name"/> <column dynamicwidth="true" label="Name" name="speaker_name"/>
<column label="" name="speaking_status" width="0"/> <column label="" name="speaking_status" width="0"/>