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
32 lines
743 B
XML
32 lines
743 B
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<menu
|
|
name="media ctrl context menu">
|
|
<menu_item_call
|
|
label="Cut"
|
|
layout="topleft"
|
|
name="Cut">
|
|
<menu_item_call.on_click
|
|
function="Edit.Cut" />
|
|
<menu_item_call.on_enable
|
|
function="Edit.EnableCut" />
|
|
</menu_item_call>
|
|
<menu_item_call
|
|
label="Copy"
|
|
layout="topleft"
|
|
name="Copy">
|
|
<menu_item_call.on_click
|
|
function="Edit.Copy" />
|
|
<menu_item_call.on_enable
|
|
function="Edit.EnableCopy" />
|
|
</menu_item_call>
|
|
<menu_item_call
|
|
label="Paste"
|
|
layout="topleft"
|
|
name="Paste">
|
|
<menu_item_call.on_click
|
|
function="Edit.Paste" />
|
|
<menu_item_call.on_enable
|
|
function="Edit.EnablePaste" />
|
|
</menu_item_call>
|
|
</menu>
|