diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-09 15:43:06 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-09 15:43:06 -0700 |
| commit | c106221726c48a4231b7854bff224ae422c0517f (patch) | |
| tree | f0608f7f72f23a447778f8bce6f210eb221ebdf1 /indra/newview/skins/default | |
| parent | cf160e30236226fdd3343a7ba50d05265709718d (diff) | |
| parent | 3b2c32fdf940b37108e13eb69fcf0468469dc182 (diff) | |
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
# .github/workflows/build.yaml
# indra/llui/llscrolllistctrl.cpp
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 2e08f6b3be..91b137b75f 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8873,6 +8873,7 @@ New Voice Morphs are available! Voice Morphs are not supported by this viewer. For more information about other voice morph tools, see [[FAQ_URL] this article]. <usetemplate + ignoretext="Warn me about voice morph not being supported" name="okignore" yestext="OK"/> <tag>voice</tag> |