Merge conflict: restored lost part of SL-13479
parent
4c889f7e52
commit
e8d95d0a9d
|
|
@ -65,107 +65,24 @@
|
|||
function="Floater.ToggleOrBringToFront"
|
||||
parameter="camera" />
|
||||
</menu_item_call>
|
||||
<menu
|
||||
create_jump_keys="true"
|
||||
label="Movement"
|
||||
name="Movement"
|
||||
tear_off="true">
|
||||
<menu_item_call
|
||||
label="Sit Down"
|
||||
layout="topleft"
|
||||
shortcut="alt|shift|S"
|
||||
name="Sit Down Here">
|
||||
<menu_item_call.on_click
|
||||
function="Self.SitDown"/>
|
||||
<menu_item_call.on_visible
|
||||
function="Self.ShowSitDown"/>
|
||||
<menu_item_call.on_enable
|
||||
function="Self.EnableSitDown" />
|
||||
</menu_item_call>
|
||||
<menu_item_call
|
||||
label="Stand Up"
|
||||
layout="topleft"
|
||||
shortcut="alt|shift|S"
|
||||
name="Stand up">
|
||||
<menu_item_call.on_click
|
||||
function="Self.StandUp"/>
|
||||
<menu_item_call.on_visible
|
||||
function="Self.EnableStandUp"/>
|
||||
<menu_item_call.on_enable
|
||||
function="Self.EnableStandUp" />
|
||||
</menu_item_call>
|
||||
<menu_item_check
|
||||
label="Fly"
|
||||
name="Fly"
|
||||
shortcut="HOME">
|
||||
<menu_item_check.on_check
|
||||
function="Agent.getFlying" />
|
||||
<menu_item_check.on_click
|
||||
function="Agent.toggleFlying" />
|
||||
<menu_item_check.on_enable
|
||||
function="Agent.enableFlying" />
|
||||
</menu_item_check>
|
||||
<menu_item_call
|
||||
label="Stop flying"
|
||||
name="Stop flying"
|
||||
shortcut="HOME">
|
||||
<menu_item_call.on_click
|
||||
function="Agent.toggleFlying" />
|
||||
<menu_item_call.on_enable
|
||||
function="Agent.getFlying" />
|
||||
</menu_item_call>
|
||||
<menu_item_check
|
||||
label="Always Run"
|
||||
name="Always Run"
|
||||
shortcut="control|R">
|
||||
<menu_item_check.on_check
|
||||
function="World.CheckAlwaysRun" />
|
||||
<menu_item_check.on_click
|
||||
function="World.AlwaysRun" />
|
||||
</menu_item_check>
|
||||
<menu_item_call
|
||||
label="Stop Animating Me"
|
||||
name="Stop Animating My Avatar"
|
||||
allow_key_repeat="true"
|
||||
shortcut="alt|shift|A">
|
||||
<menu_item_call.on_click
|
||||
function="Tools.StopAllAnimations" />
|
||||
</menu_item_call>
|
||||
<menu_item_check
|
||||
label="Walk / run / fly..."
|
||||
name="WalkRunFly">
|
||||
<menu_item_check.on_check
|
||||
function="Floater.Visible"
|
||||
parameter="moveview" />
|
||||
<menu_item_check.on_click
|
||||
function="Floater.ToggleOrBringToFront"
|
||||
parameter="moveview" />
|
||||
</menu_item_check>
|
||||
</menu>
|
||||
|
||||
<menu
|
||||
create_jump_keys="true"
|
||||
label="Status"
|
||||
name="Status"
|
||||
tear_off="true">
|
||||
<menu_item_check
|
||||
name="Away"
|
||||
label="Away">
|
||||
<menu_item_check.on_check
|
||||
function="View.Status.CheckAway" />
|
||||
<menu_item_check.on_click
|
||||
function="World.SetAway" />
|
||||
</menu_item_check>
|
||||
<menu_item_check
|
||||
name="Do Not Disturb"
|
||||
label="Do Not Disturb">
|
||||
<menu_item_check.on_check
|
||||
function="View.Status.CheckDoNotDisturb" />
|
||||
<menu_item_check.on_click
|
||||
function="World.SetDoNotDisturb"/>
|
||||
</menu_item_check>
|
||||
|
||||
</menu>
|
||||
<menu_item_separator/>
|
||||
<menu_item_check
|
||||
name="Away"
|
||||
label="Away">
|
||||
<menu_item_check.on_check
|
||||
function="View.Status.CheckAway" />
|
||||
<menu_item_check.on_click
|
||||
function="World.SetAway" />
|
||||
</menu_item_check>
|
||||
<menu_item_check
|
||||
name="Do Not Disturb"
|
||||
label="Do Not Disturb">
|
||||
<menu_item_check.on_check
|
||||
function="View.Status.CheckDoNotDisturb" />
|
||||
<menu_item_check.on_click
|
||||
function="World.SetDoNotDisturb"/>
|
||||
</menu_item_check>
|
||||
|
||||
<menu_item_separator/>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue