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/en/notifications.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/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1584de6880..f86b297395 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8842,6 +8842,20 @@ New Voice Morphs are available! </notification> <notification + icon="alertmodal.tga" + name="VoiceEffectsNotSupported" + sound="UISndAlert" + persist="true" + type="alertmodal"> +Voice Morphs are not supported by this viewer. + <usetemplate + notext="Cancel" + name="okcancelbuttons" + yestext="Disable Voice Morphing"/> + <tag>voice</tag> + </notification> + + <notification icon="notifytip.tga" name="Cannot enter parcel: not a group member" type="notifytip"> |