summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-02-28 21:55:28 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-02-28 21:55:28 +0200
commit201f83472c604e837b40c12f3750602e30d79d0b (patch)
treeb5e983c44eb9913c5778f0773ac986d6bf038e20 /indra/newview/skins/default/xui/zh
parent696795a368a8825fb083627e39f65dcc30266122 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge branch 'master' into DRTVWR-543-maint
Diffstat (limited to 'indra/newview/skins/default/xui/zh')
-rw-r--r--indra/newview/skins/default/xui/zh/menu_place_add_button.xml4
-rw-r--r--indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
index 95f8917234..165e2b6f08 100644
--- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
<menu_item_call label="添加資料夾" name="add_folder"/>
<menu_item_call label="添加地標" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
index bf60983896..200e1904f6 100644
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
<menu_item_call label="瞬間傳送" name="Teleport"/>
<menu_item_call label="更多資訊" name="More Information"/>
<menu_item_call label="覆製 SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>