diff options
| author | Jacek Antonelli | 2009-06-05 17:46:46 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-06-05 17:46:46 -0500 |
| commit | 47909d744921d27bb404a29d5afa34120c9939e3 (patch) | |
| tree | 7d09b5e46c8f8ec7278802b82c3f0d6f37ef2ad9 /linden | |
| parent | Mute in Profile window triggers confirmation dialog too. (diff) | |
| parent | Reverted Ctrl-D shortcut back to Edit > Duplicate. (diff) | |
| download | meta-impy-47909d744921d27bb404a29d5afa34120c9939e3.zip meta-impy-47909d744921d27bb404a29d5afa34120c9939e3.tar.gz meta-impy-47909d744921d27bb404a29d5afa34120c9939e3.tar.bz2 meta-impy-47909d744921d27bb404a29d5afa34120c9939e3.tar.xz | |
Merge branch 'revert-ctrl-d' into next-1.1
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 4758116..086f059 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | |||
| @@ -127,7 +127,7 @@ | |||
| 127 | </menu_item_call> | 127 | </menu_item_call> |
| 128 | <menu_item_separator /> | 128 | <menu_item_separator /> |
| 129 | <menu_item_call name="Duplicate" enabled="false" | 129 | <menu_item_call name="Duplicate" enabled="false" |
| 130 | label="Duplicate"> | 130 | label="Duplicate" shortcut="control|D"> |
| 131 | <on_click function="Edit.Duplicate" userdata="" /> | 131 | <on_click function="Edit.Duplicate" userdata="" /> |
| 132 | <on_enable function="Edit.EnableDuplicate" /> | 132 | <on_enable function="Edit.EnableDuplicate" /> |
| 133 | </menu_item_call> | 133 | </menu_item_call> |
| @@ -487,8 +487,7 @@ | |||
| 487 | <on_check control="FlyBtnState" /> | 487 | <on_check control="FlyBtnState" /> |
| 488 | </menu_item_check> | 488 | </menu_item_check> |
| 489 | <menu_item_separator /> | 489 | <menu_item_separator /> |
| 490 | <menu_item_call name="Create Landmark Here" shortcut="control|D" | 490 | <menu_item_call name="Create Landmark Here" label="Create Landmark Here"> |
| 491 | label="Create Landmark Here"> | ||
| 492 | <on_click function="World.CreateLandmark" userdata="" /> | 491 | <on_click function="World.CreateLandmark" userdata="" /> |
| 493 | <on_enable function="World.EnableCreateLandmark" userdata="" /> | 492 | <on_enable function="World.EnableCreateLandmark" userdata="" /> |
| 494 | </menu_item_call> | 493 | </menu_item_call> |