livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-2859, Additionally remove volume controls from groupchat slideout participant list.

meow-7.2.2
Arrehn 2011-09-04 11:05:22 -04:00
parent fbea991196
commit be4df3fac0
5 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -14096,7 +14096,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>SpeakerParticipantRemoveDelay</key>
<map>

2
indra/newview/llpanelimcontrolpanel.cpp
View File

@ -419,7 +419,7 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id)
if(!mParticipantList)
{
LLSpeakerMgr* speaker_manager = LLIMModel::getInstance()->getSpeakerManager(session_id);
mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("speakers_list"), true,false);
mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("grp_speakers_list"), true,false);
}
}

47
indra/newview/skins/default/xui/en/menu_participant_list.xml
View File

@ -2,28 +2,6 @@
<context_menu
layout="topleft"
name="Participant List Context Menu">
<menu_item_check
label="Sort by Name"
layout="topleft"
name="SortByName">
<on_check
function="ParticipantList.CheckItem"
parameter="is_sorted_by_name" />
<on_click
function="ParticipantList.Sort"
parameter="sort_by_name" />
</menu_item_check>
<menu_item_check
label="Sort by Recent Speakers"
layout="topleft"
name="SortByRecentSpeakers">
<on_check
function="ParticipantList.CheckItem"
parameter="is_sorted_by_recent_speakers" />
<on_click
function="ParticipantList.Sort"
parameter="sort_by_recent_speakers" />
</menu_item_check>
<menu_item_call
label="View Profile"
layout="topleft"
@ -84,6 +62,31 @@
function="ParticipantList.EnableItem"
parameter="can_pay" />
</menu_item_call>
<menu_item_separator
layout="topleft"
name="Sort Separator" />
<menu_item_check
label="Sort by Name"
layout="topleft"
name="SortByName">
<on_check
function="ParticipantList.CheckItem"
parameter="is_sorted_by_name" />
<on_click
function="ParticipantList.Sort"
parameter="sort_by_name" />
</menu_item_check>
<menu_item_check
label="Sort by Recent Speakers"
layout="topleft"
name="SortByRecentSpeakers">
<on_check
function="ParticipantList.CheckItem"
parameter="is_sorted_by_recent_speakers" />
<on_click
function="ParticipantList.Sort"
parameter="sort_by_recent_speakers" />
</menu_item_check>
<menu_item_separator
layout="topleft"
name="View Icons Separator" />

2
indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
View File

@ -35,7 +35,7 @@
height="130"
ignore_online_status="true"
layout="topleft"
name="speakers_list"
name="grp_speakers_list"
opaque="false"
show_info_btn="true"
show_profile_btn="false"

2
indra/newview/skins/default/xui/en/panel_group_control_panel.xml
View File

@ -34,7 +34,7 @@
height="90"
ignore_online_status="true"
layout="topleft"
name="speakers_list"
name="grp_speakers_list"
opaque="false"
show_info_btn="true"
show_profile_btn="false"