From a19c5b048c4c40d746909d8046708843e7ad0748 Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Tue, 15 Sep 2020 13:59:27 -0400 Subject: [PATCH] Fix copy commands in menus by removing rlv check for now --- indra/newview/skins/default/xui/en/menu_avatar_icon.xml | 8 -------- indra/newview/skins/default/xui/en/menu_conversation.xml | 8 -------- .../newview/skins/default/xui/en/menu_im_conversation.xml | 8 -------- indra/newview/skins/default/xui/en/menu_name_field.xml | 8 -------- indra/newview/skins/default/xui/en/menu_people_nearby.xml | 8 -------- .../default/xui/en/menu_people_nearby_multiselect.xml | 8 -------- 6 files changed, 48 deletions(-) diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml index d33c5d5c4d8..aaf8c6c55fc 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml @@ -158,8 +158,6 @@ <menu_item_call.on_click function="AvatarIcon.CopyData" parameter="user_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Display Name" @@ -167,8 +165,6 @@ <menu_item_call.on_click function="AvatarIcon.CopyData" parameter="display_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Account Name" @@ -176,8 +172,6 @@ <menu_item_call.on_click function="AvatarIcon.CopyData" parameter="account_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy SLurl" @@ -185,8 +179,6 @@ <menu_item_call.on_click function="AvatarIcon.CopyData" parameter="slurl"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy ID" diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index 0276550fe0f..cbf15c22b40 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -232,8 +232,6 @@ <menu_item_call.on_click function="Avatar.DoToSelected" parameter="copy_username"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Display Name" @@ -241,8 +239,6 @@ <menu_item_call.on_click function="Avatar.DoToSelected" parameter="copy_display_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Account Name" @@ -250,8 +246,6 @@ <menu_item_call.on_click function="Avatar.DoToSelected" parameter="copy_account_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy SLurl" @@ -259,8 +253,6 @@ <menu_item_call.on_click function="Avatar.DoToSelected" parameter="copy_slurl"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy ID" diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml index dd65c1331d9..a8d810eb8a6 100644 --- a/indra/newview/skins/default/xui/en/menu_im_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml @@ -105,8 +105,6 @@ <menu_item_call.on_click function="Avatar.GearDoToSelected" parameter="copy_username"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Display Name" @@ -114,8 +112,6 @@ <menu_item_call.on_click function="Avatar.GearDoToSelected" parameter="copy_display_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Account Name" @@ -123,8 +119,6 @@ <menu_item_call.on_click function="Avatar.GearDoToSelected" parameter="copy_account_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy SLurl" @@ -132,8 +126,6 @@ <menu_item_call.on_click function="Avatar.GearDoToSelected" parameter="copy_slurl"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy ID" diff --git a/indra/newview/skins/default/xui/en/menu_name_field.xml b/indra/newview/skins/default/xui/en/menu_name_field.xml index c88373dd080..62fbabefddc 100644 --- a/indra/newview/skins/default/xui/en/menu_name_field.xml +++ b/indra/newview/skins/default/xui/en/menu_name_field.xml @@ -7,8 +7,6 @@ <menu_item_call.on_click function="Profile.CopyName" parameter="user_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Display Name" @@ -16,8 +14,6 @@ <menu_item_call.on_click function="Profile.CopyName" parameter="display_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Account Name" @@ -25,8 +21,6 @@ <menu_item_call.on_click function="Profile.CopyName" parameter="account_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy SLurl" @@ -34,8 +28,6 @@ <menu_item_call.on_click function="Profile.CopyName" parameter="slurl"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy ID" diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index f0c25efd875..ef4b0e00e89 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -221,8 +221,6 @@ <menu_item_call.on_click function="Avatar.CopyData" parameter="user_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Display Name" @@ -230,8 +228,6 @@ <menu_item_call.on_click function="Avatar.CopyData" parameter="display_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Account Name" @@ -239,8 +235,6 @@ <menu_item_call.on_click function="Avatar.CopyData" parameter="account_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy SLurl" @@ -248,8 +242,6 @@ <menu_item_call.on_click function="Avatar.CopyData" parameter="slurl"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy ID" diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml index 4de048f01a1..6c366fea782 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml @@ -128,8 +128,6 @@ <menu_item_call.on_click function="Avatar.CopyData" parameter="user_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Display Name" @@ -137,8 +135,6 @@ <menu_item_call.on_click function="Avatar.CopyData" parameter="display_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy Account Name" @@ -146,8 +142,6 @@ <menu_item_call.on_click function="Avatar.CopyData" parameter="account_name"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy SLurl" @@ -155,8 +149,6 @@ <menu_item_call.on_click function="Avatar.CopyData" parameter="slurl"/> - <menu_item_call.on_enable - function="RLV.CanShowName" /> </menu_item_call> <menu_item_call label="Copy ID" -- GitLab