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
7 lines
239 B
XML
7 lines
239 B
XML
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
|
<menu name="media ctrl context menu">
|
|
<menu_item_call label="Cortar" name="Cut"/>
|
|
<menu_item_call label="Cortar" name="Copy"/>
|
|
<menu_item_call label="Colar" name="Paste"/>
|
|
</menu>
|