diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 00:51:02 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 00:51:02 +0300 |
| commit | a4c6c7059ffc9c61bd66758dddee74383e112fe1 (patch) | |
| tree | 740e72af630ec1a75dd8949cfe1c67ea1076183c /indra/newview/skins/default/xui/en/menu_favorites.xml | |
| parent | abf8c4b364bca97d4295797a14f459d85bef1714 (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_favorites.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_favorites.xml | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml index be380e11e5..0eab7c451b 100644 --- a/indra/newview/skins/default/xui/en/menu_favorites.xml +++ b/indra/newview/skins/default/xui/en/menu_favorites.xml @@ -21,12 +21,12 @@ parameter="about" /> </menu_item_call> <menu_item_call - label="Copy SLurl" + label="Move to Landmarks" layout="topleft" - name="Copy slurl"> + name="Move to Landmarks"> <menu_item_call.on_click function="Favorites.DoToSelected" - parameter="copy_slurl" /> + parameter="move_to_landmarks" /> </menu_item_call> <menu_item_call label="Show on Map" @@ -36,6 +36,25 @@ function="Favorites.DoToSelected" parameter="show_on_map" /> </menu_item_call> + <menu_item_call + label="Copy SLurl" + layout="topleft" + name="Copy slurl"> + <menu_item_call.on_click + function="Favorites.DoToSelected" + parameter="copy_slurl" /> + </menu_item_call> + <menu_item_call + label="Create Pick" + layout="topleft" + name="create_pick"> + <menu_item_call.on_click + function="Favorites.DoToSelected" + parameter="create_pick" /> + <menu_item_call.on_enable + function="Favorites.EnableSelected" + parameter="create_pick" /> + </menu_item_call> <menu_item_separator layout="topleft" /> @@ -59,10 +78,14 @@ function="Favorites.EnableSelected" parameter="can_paste" /> </menu_item_call> - - <menu_item_separator - layout="topleft" /> - + <menu_item_call + label="Rename" + layout="topleft" + name="rename"> + <menu_item_call.on_click + function="Favorites.DoToSelected" + parameter="rename" /> + </menu_item_call> <menu_item_call label="Delete" layout="topleft" |