Commit Graph

69033 Commits (bfad8764a0383452b79c2bbf7b92dbbc697ee0a2)

Author SHA1 Message Date
Ansariel bfad8764a0 Update German translation 2023-03-30 02:53:04 +02:00
Ansariel b29cfa8159 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llimview.cpp
#	indra/newview/skins/default/xui/en/strings.xml
2023-03-30 02:51:16 +02:00
Ansariel 69fd2d9973 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/cmake/00-Common.cmake
2023-03-30 02:49:33 +02:00
Ansariel a562244671 No FMOD Update for you, crappy Mac!
This reverts commit c9d2db1775.
2023-03-30 02:45:02 +02:00
Pork Chop 8d6c2687c9 Fix for FIRE-32843 - typo in phototools tooltip 2023-03-30 10:57:00 +11:00
PanteraPolnocy ae53593dad FIRE-32842, FIRE-32841 Updated Russian translation (by Romka Swallowtail), French translation (by Laurent Bechir) and Polish one; Alpha channel related 2023-03-30 00:30:48 +02:00
Nat Goodspeed c7053a6928 Increment viewer version to 6.6.11
following promotion of DRTVWR-573
2023-03-29 16:56:36 -04:00
Ansariel b1ec350c4b Update German translation 2023-03-29 16:16:06 +02:00
Ansariel c9d2db1775 Update FMOD Studio to 2.02.13 on OSX 2023-03-29 16:06:35 +02:00
Zi Ree 9f6fff9af4 Add detection of empty/almost empty alpha layers in image uploads and strip those layers by default, unless instructed otherwise. 2023-03-27 22:00:14 +02:00
Brad Linden d6cf9e2772 Attempt to fix build breakage for DRTVWR-559 2023-03-27 22:04:02 +03:00
Andrey Lihatskiy c61a2b466a SL-17761 Updated the login failure message 2023-03-27 21:24:36 +03:00
Ansariel 98b5ca0690 Remove Python 2 compatibility hack 2023-03-27 16:01:51 +02:00
Pork Chop b3d9c81370 Linux: Update FMOD Studio to 2.02.13 2023-03-27 22:40:02 +11:00
Ansariel 2c581cb994 Update FMOD Studio to 2.02.13 on Windows 2023-03-27 11:50:32 +02:00
Andrey Lihatskiy 9da0f76d2c SL-19462 Declare the FetchGroupChatHistory setting in the code
to make it accessible after updating the viewer
2023-03-23 14:35:55 +02:00
Pork Chop 19d37d0c18 Linux: GCC 13 -- Supress the massive amount of warnings pertaining to C++20 compatibility, the viewer likely wont be C++20 compliant anywhere in the near future 2023-03-21 22:05:36 +11:00
Ansariel eb13f813bd Update German translation 2023-03-21 11:33:02 +01:00
Ansariel 51db156b7c Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llviewermessage.cpp
#	indra/newview/skins/default/xui/en/strings.xml
2023-03-21 11:32:38 +01:00
Ansariel 40b731eb76 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
# Conflicts:
#	.gitignore
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/llwindow/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/viewer_manifest.py
2023-03-21 10:57:56 +01:00
Andrey Lihatskiy 79e51195fb SL-19289 UI for Estate Floater - Block Scripted Agents from Estate/Region 2023-03-21 00:05:42 +02:00
Brad Payne (Vir Linden) 72cec2d347 SL-19161 - logging of basic translation stats in ViewerStats 2023-03-20 22:39:48 +02:00
Andrey Lihatskiy dca3c83cd9 Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
Bennett Goble ffa8d83eaf SL-17761: Replace 'Grid emergency' message with generic error
The viewer currently presents a startling "Grid emergency" warning if an
unrecognized error is returned from login. Let's tone this down a bit
and present the error as it is: an unrecognized login failure rather
than SLearth exploding.
2023-03-13 14:36:08 +02:00
Beq 54c4f5ba0d Clean up as we go to allow Linux bloat monster to build.
clean up ~25G wasted space on Linux build server
Linux only
Try gcc=10
Add swap space back
2023-03-07 22:17:58 +00:00
Ansariel 50341b9735 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
2023-03-07 13:20:32 +01:00
Ansariel d9e2115374 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-07 12:47:54 +01:00
Andrey Kleshchev 0c2b00efaa SL-19346 PERMISSION_DEBIT remove warning for Linden owned content 2023-03-06 22:53:04 +02:00
Beq 35ee14193e Merge branch 'revisitriggedlocalmesh' 2023-03-06 11:13:21 +00:00
Beq 960edca234 Merge remote-tracking branch 'origin/master' 2023-03-06 11:09:05 +00:00
simon 9ee7c2598e SL-18268 - merge fix for viewer update to read group chat history
added missing app setting
2023-03-01 15:09:56 -08:00
Ansariel 0d72cb7f6e Fix warning about missing color definition for NotecardTextColor 2023-02-24 14:48:46 +01:00
PanteraPolnocy 72d606751b FIRE-32749 Russian translation update, by Romka Swallowtail 2023-02-22 02:45:27 +01:00
Beq 9d34700179 experimental workaround to non-rigged to rigged transition bug 2023-02-19 22:36:14 +00:00
Beq 712031bb2f changes towards fixing rigged local mesh WiP 2023-02-19 22:36:14 +00:00
Beq 6a92614003 Merge branch 'improve-gha-build' 2023-02-19 22:35:33 +00:00
PanteraPolnocy ea2fa8db13 FIRE-32739 French translation update, by Laurent Bechir 2023-02-19 06:26:24 +01:00
Beq 7d5c93ce8b Update GHA to improve handling of new 3p bundles.
also Update ubuntu to 20.04
deal with macOS being out of date (not to mention BSD)
handle case where some 3ps are generic (32/64)
2023-02-18 14:37:24 +00:00
Beq 3e96187edf Improve GHA builds
- make sure we use the latest bundles provided
- rearrange things a little.
- make some initial steps towards trying to make things fail when config/build fails.



Improve OS/SL config switch


always use latest package version (by timestamp)


try another method that deals with not found (looking at you linux havok)


oops


I hate shell bl@*&y scripts


fix pattern


revert the autobuild version


wth


this makes no sense


fs-variables must be imported after the code
2023-02-18 14:37:24 +00:00
Beq 4286f0b112 Restore Perf tracking for non-alpha blend
Verified that this does not impact the previously associated JIRAs FIRE-31986, FIRE-31979
2023-02-18 14:29:02 +00:00
PanteraPolnocy dc4a2c2b4c Updated Polish translation 2023-02-17 22:24:47 +01:00
Ansariel 69a01606c1 FIRE-32736: Add confirmation before ungrouping folder 2023-02-17 15:24:31 +01:00
Zi Ree 79c9873cd0 Linux: Pull in Alchemy's vertex cache optimizer fix to smooth out triangle soup in certain hair/tails - Thank you! 2023-02-16 17:46:43 +01:00
Pork Chop baa9c6d731 Linux: CEF bump from 91 -> 92 -- note, it is not possible to upgrade to later versions of CEF beyond 92 due to API changes introduced in later versions of CEF - this situation will of course change once the viewer source is updated to be compatible with the later CEF API's 2023-02-17 02:59:35 +11:00
Zi Ree 000691bf2b Linux: FIRE-32559: vsync not working after restart, also: remove weird inverted vsync logic for SDL based windows which was not even implemented correctly 2023-02-16 15:06:33 +01:00
Ansariel a08e6d5a8f FIRE-32722: Make sure to idle if actually minimize 2023-02-15 14:31:37 +01:00
Ansariel 86253a8d8a Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/lllogchat.cpp
2023-02-14 23:23:36 +01:00
Ansariel 5bbf10db62 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-14 22:03:06 +01:00
simon f257ee7d3c SL-18268 - Viewer update to read group chat history.
Feature described at https://community.secondlife.com/blogs/entry/12652-coming-soon-to-a-viewer-near-you-group-chat-history/
2023-02-13 15:19:27 -08:00
PanteraPolnocy eb4c6a3d04 FIRE-32718 Statistics Bar - Active Object - Mouseover Text 2023-02-13 23:22:37 +01:00