Conflicts: indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two. Compile fixies: indra/newview/llavataractions.cpp needed to include llnotifications.h indra/newview/llvoicechannel.cpp needed to include llnotifications.h
19 lines
3.6 KiB
XML
19 lines
3.6 KiB
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<panel border="false" height="120" label="Audio & Video" name="Media panel" width="250">
|
|
<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="181"/>
|
|
<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
|
|
<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="181"/>
|
|
<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_music" toggle="true" width="25"/>
|
|
<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.005" initial_val="0.5" label="Media" label_width="55" left="10" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="181"/>
|
|
<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_media" toggle="true" width="25"/>
|
|
<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.005" initial_val="0.5" label="Voice" label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="181"/>
|
|
<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
|
|
<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.005" initial_val="0.5" label="Sounds" label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="181"/>
|
|
<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
|
|
<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.005" initial_val="0.5" label="Ambient" label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="181"/>
|
|
<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
|
|
<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="181"/>
|
|
<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
|
|
<button bottom_delta="-20" control_name="ShowNearbyMediaFloater" follows="top" height="18" left="10" label="Nearby Media" name="nearby_media" toggle="true" width="200"/>
|
|
</panel>
|