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
11 lines
542 B
XML
11 lines
542 B
XML
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
|
<panel label="Áudio & Vídeo" name="Media panel">
|
|
<slider label="Mestre" name="System Volume"></slider>
|
|
<slider label="Música" name="Music Volume"></slider>
|
|
<slider label="Mídia" name="Media Volume"></slider>
|
|
<slider label="Voz" name="Voice Volume"></slider>
|
|
<slider label="Sons" name="SFX Volume"></slider>
|
|
<slider label="Ambiente" name="Wind Volume"></slider>
|
|
<slider label="UI" name="UI Volume"></slider>
|
|
<button label="Mídia por perto" name="nearby_media"/>
|
|
</panel> |