summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-07-17 14:35:17 -0700
committerBrad Linden <brad@lindenlab.com>2024-07-17 14:35:17 -0700
commit3e4b23539c2b8dfc0e07256f350f4ca0f232f756 (patch)
tree7ec6e864b1c0ed95223c3aca7a503c7c5a218dad /indra/newview/skins/default/xui/zh
parent72605e75b7f1be965e55f5848bc7b57dda9d5e22 (diff)
parent162bb33e15fc9a5bf8dcdddd988dc93fcfb317bd (diff)
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts: # autobuild.xml # indra/newview/llvoicechannel.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/zh')
-rw-r--r--indra/newview/skins/default/xui/zh/menu_viewer.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 972434dfc5..a048af7b68 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -40,12 +40,6 @@
<menu_item_call label="臉書…" name="Facebook"/>
<menu_item_call label="推特…" name="Twitter"/>
<menu_item_call label="Flickr…" name="Flickr"/>
- <menu label="語音變聲" name="VoiceMorphing">
- <menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
- <menu_item_check label="預覽……" name="Preview"/>
- <menu_item_call label="訂閱……" name="Subscribe"/>
- <menu_item_call label="付費會員獨享…" name="PremiumPerk"/>
- </menu>
<menu_item_check label="姿勢…" name="Gestures"/>
<menu_item_check label="朋友" name="My Friends"/>
<menu_item_check label="群組" name="My Groups"/>