diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:16:09 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:16:09 +0300 |
commit | 5c18921e9ada7799e31b30e16aabc0580e5d5d38 (patch) | |
tree | 28d8f9c2bed0909c897be5318b31a91a23c835b4 /indra/newview/skins/default/xui/en/menu_viewer.xml | |
parent | 1f930a7222b66ebf254ccf8cbda965514915fc3f (diff) | |
parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 64604d390f..6c317f9995 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -47,8 +47,7 @@ label="Picks..." name="Picks"> <menu_item_call.on_click - function="Floater.ToggleOrBringToFront" - parameter="picks" /> + function="ShowAgentProfilePicks" /> </menu_item_call> <menu_item_call label="Experiences..." |