diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-12-10 22:39:07 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-10 22:39:07 +0000 |
| commit | 5ec1ecc314823f41bd2408293907b7670ff65981 (patch) | |
| tree | 35ced8b78c17495ce46cc631bcc5a544f686fa70 /indra/newview/skins/default | |
| parent | f0146befc76f401c344ae2759c70b67b37cbf717 (diff) | |
| parent | b3f8cec38c15fecaf39b7b187aa46e8df9df8eff (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_login.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 9b439c16e0..53be40d7fd 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -45,7 +45,8 @@ name="Second Life Help" shortcut="F1"> <menu_item_call.on_click - function="ShowHelp" /> + function="ShowHelp" + parameter="f1_help" /> </menu_item_call> <menu_item_separator /> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 5da88ff171..0891afaf76 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1064,7 +1064,8 @@ name="Second Life Help" shortcut="F1"> <menu_item_call.on_click - function="ShowHelp" /> + function="ShowHelp" + parameter="f1_help" /> </menu_item_call> <menu_item_call label="Tutorial" |