diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 00:30:07 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 00:30:49 +0300 |
commit | d19d82712125b8a70056f2fa288cdd25205770a8 (patch) | |
tree | ece789aa802dac877fc8fe8cb035894e3a4427a6 /indra/newview/skins/default/xui/en/menu_viewer.xml | |
parent | fbccc0986d6487c4490edee6e5793fcaeaf3415b (diff) | |
parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) |
Merge branch master (DRTVWR-483) into DRTVWR-559
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
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 cf99240908..eb4f9f16fa 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..." |