diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:29:21 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:29:21 +0300 |
| commit | 3a4720d1f523ca8ebee0d963604c236c08980eae (patch) | |
| tree | ff5c6adb045d104aa3cce6c6c68e63e3c55659cb /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 34c13264f33d9bbfc73302b84c8fade1b115fb93 (diff) | |
| parent | 169599fd2f211d66f80a54e13daf975229607022 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FreeType.cmake
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/en/floater_fast_timers.xml
# indra/newview/viewer_manifest.py
# indra/test/test.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 21 |
1 files changed, 21 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..e539388735 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2388,6 +2388,26 @@ Unable to upload [FILE] due to the following reason: [REASON] Please try again later. <tag>fail</tag> </notification> + + <notification + icon="alertmodal.tga" + name="CannotUploadSnapshotEmailTooBig" + type="alertmodal"> +Unable to upload snapshot [FILE] due to the following reason: [REASON] + +File might be too big, try reducing resolution, quality or try again later. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="CannotUploadSnapshotWebTooBig" + type="alertmodal"> +Unable to upload snapshot. + +File might be too big, try reducing resolution or try again later. + <tag>fail</tag> + </notification> <notification icon="notifytip.tga" @@ -8873,6 +8893,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> |