bdc94eac5c
Merge remote-tracking branch 'origin/master'
2023-04-03 15:33:29 +01:00
82802e59f6
Wrong!
2023-04-03 14:34:42 +02:00
110096438e
Typo in CMake breaks Mac.
2023-04-03 13:14:41 +01:00
fc4181b478
Odd merge issue and ignore more crap.
2023-04-03 12:39:43 +01:00
8ef61f6171
Remove stray comment marker, oops!
2023-04-03 05:30:49 +02:00
13e8028c9f
Removing the duplicate which I noticed a second too late
2023-04-02 23:56:58 +02:00
1d69d5a3f7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-04-02 23:46:51 +02:00
3aaebe8ac4
FIRE-32846, FIRE-32845 Updated French (Laurent Bechir), Russian (Romka Swallowtail) and Polish translations, minor adjustments to English one
2023-04-02 23:46:42 +02:00
b1e8f003e6
Linux: Update various 3p libraries
2023-04-02 23:07:44 +10:00
377ee00657
Remove some apparently orphaned CMake files
2023-04-01 19:36:01 +02:00
068d2a9b02
Fix disk cache after merge
2023-04-01 16:16:53 +02:00
7625a540e4
FMOD Studio update to 2.02.13 for crappy Mac, attempt #2
2023-03-31 09:46:42 +02:00
934616de29
Linux: Restore more linux specific cmake configuration that went bye bye in the last merge - fixes the ability to toggle between internal/external browsers in preferences
2023-03-31 01:07:46 +11:00
e5c681ce8e
Linux: Restore crashreporting (hopefully)
2023-03-31 00:05:29 +11:00
492a11fe8b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-573
2023-03-30 02:53:56 +02:00
bfad8764a0
Update German translation
2023-03-30 02:53:04 +02:00
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
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
a562244671
No FMOD Update for you, crappy Mac!
...
This reverts commit c9d2db1775
2023-03-30 02:45:02 +02:00
8d6c2687c9
Fix for FIRE-32843 - typo in phototools tooltip
2023-03-30 10:57:00 +11:00
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
c7053a6928
Increment viewer version to 6.6.11
...
following promotion of DRTVWR-573
2023-03-29 16:56:36 -04:00
b1ec350c4b
Update German translation
2023-03-29 16:16:06 +02:00
c9d2db1775
Update FMOD Studio to 2.02.13 on OSX
2023-03-29 16:06:35 +02:00
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
d6cf9e2772
Attempt to fix build breakage for DRTVWR-559
2023-03-27 22:04:02 +03:00
c61a2b466a
SL-17761 Updated the login failure message
2023-03-27 21:24:36 +03:00
98b5ca0690
Remove Python 2 compatibility hack
2023-03-27 16:01:51 +02:00
b3d9c81370
Linux: Update FMOD Studio to 2.02.13
2023-03-27 22:40:02 +11:00
2c581cb994
Update FMOD Studio to 2.02.13 on Windows
2023-03-27 11:50:32 +02:00
90e8853948
Linux: Quench/fix some gcc warnings, unsure how genuine they are at this point.
2023-03-26 15:51:50 +02:00
88d6791ff1
Linux: Quench gcc warnings in boost includes.
2023-03-26 15:49:22 +02:00
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
5c8d7d748b
Linux: Initial work to fix broken build, restore gstreamer 1.0
2023-03-23 21:56:53 +11:00
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
eb13f813bd
Update German translation
2023-03-21 11:33:02 +01:00
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
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
79e51195fb
SL-19289 UI for Estate Floater - Block Scripted Agents from Estate/Region
2023-03-21 00:05:42 +02:00
72cec2d347
SL-19161 - logging of basic translation stats in ViewerStats
2023-03-20 22:39:48 +02:00
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
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
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
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
d9e2115374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-07 12:47:54 +01:00
0c2b00efaa
SL-19346 PERMISSION_DEBIT remove warning for Linden owned content
2023-03-06 22:53:04 +02:00
35ee14193e
Merge branch 'revisitriggedlocalmesh'
2023-03-06 11:13:21 +00:00
960edca234
Merge remote-tracking branch 'origin/master'
2023-03-06 11:09:05 +00:00
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
0d72cb7f6e
Fix warning about missing color definition for NotecardTextColor
2023-02-24 14:48:46 +01:00
Beq