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
12 lines
615 B
XML
12 lines
615 B
XML
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
|
<panel label="Audio et vidéo" name="Media panel">
|
|
<slider label="Général" label_width="65" name="System Volume"/>
|
|
<slider label="Musique" label_width="65" name="Music Volume"/>
|
|
<slider label="Média" label_width="65" name="Media Volume"/>
|
|
<slider label="Voix" label_width="65" name="Voice Volume"/>
|
|
<slider label="Sons" label_width="65" name="SFX Volume"/>
|
|
<slider label="Son ambiant" label_width="65" name="Wind Volume"/>
|
|
<slider label="Interface" label_width="65" name="UI Volume"/>
|
|
<button label="Médias proches" name="nearby_media"/>
|
|
</panel>
|