diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-07-17 14:35:17 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-07-17 14:35:17 -0700 |
| commit | 3e4b23539c2b8dfc0e07256f350f4ca0f232f756 (patch) | |
| tree | 7ec6e864b1c0ed95223c3aca7a503c7c5a218dad /indra/newview/skins/default/xui/it/menu_viewer.xml | |
| parent | 72605e75b7f1be965e55f5848bc7b57dda9d5e22 (diff) | |
| parent | 162bb33e15fc9a5bf8dcdddd988dc93fcfb317bd (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/it/menu_viewer.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/menu_viewer.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 043fd28ddb..85999ccbe0 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -42,12 +42,6 @@ <menu_item_call label="Facebook..." name="Facebook"/> <menu_item_call label="Twitter..." name="Twitter"/> <menu_item_call label="Flickr..." name="Flickr"/> - <menu label="Manipolazione voce" name="VoiceMorphing"> - <menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/> - <menu_item_check label="Anteprima..." name="Preview"/> - <menu_item_call label="Abbonati..." name="Subscribe"/> - <menu_item_call label="Vantaggio Premium..." name="PremiumPerk"/> - </menu> <menu_item_check label="Gesture..." name="Gestures"/> <menu_item_check label="Amici" name="My Friends"/> <menu_item_check label="Gruppi" name="My Groups"/> |