793bed7d06
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
630b4432da
Revert "DRTVWR-587 Bring back the previously reverted change"
...
This reverts commit 9d49edbc48
2023-10-30 20:12:48 +02:00
9d49edbc48
DRTVWR-587 Bring back the previously reverted change
2023-10-30 17:02:08 +02:00
673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
e7c586246c
D587 Post merge fmod issues fix
2023-10-26 01:12:29 +03:00
4c6ae49c88
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# autobuild.xml
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/viewer_manifest.py
2023-10-25 21:28:26 +03:00
cc41888af3
Merge pull request #427 from secondlife/signal/py312
...
Add python 3.12 to FindPython search path
2023-10-12 12:03:07 -04:00
e9f493cea0
Add python 3.12 to FindPython search path
...
Look for python 3.12 in the registry along with all the other versions.
2023-10-08 16:36:54 -07:00
03d2dc5d2c
Revert "DRTVWR-587: Simplify Python.cmake by omitting find_package(Python3)."
2023-10-04 20:57:25 +03:00
566ace0d56
DRTVWR-587: Adopt Ansariel's Python.cmake Windows simplification.
2023-09-08 14:37:09 -04:00
b8e6777439
SL-18837: Merge branch 'main' into actions
2023-09-07 11:15:56 -04:00
7efe86cdde
DRTVWR-587: Simplify Python.cmake by omitting find_package(Python3).
...
Elsewhere in CMake land, we reference PYTHONINTERP_FOUND and
PYTHON_EXECUTABLE, both of which are explicitly set by Python.cmake. We don't
seem to need the find_package(Python3 COMPONENTS Interpreter) call. Given that
we take some pains to be careful about which Windows Python interpreter we
find, this eliminates a wildcard.
2023-09-05 16:42:48 -04:00
512d450fe3
Fix CMake CMP0148 deprecation warning introduced with CMake 3.27.4
2023-08-31 18:59:23 +03:00
7373fd91fa
Merge remote-tracking branch 'origin/main' into DRTVWR-489
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-24 01:23:52 +03:00
ae63ed51aa
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 ( #292 )
2023-07-18 14:38:18 -07:00
71e7c7c705
Fixes for compatibility with new xcode 15 beta for any viewer branch after DRTVWR-577 ( #232 )
2023-07-18 12:00:01 +03:00
726851b039
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
...
to resolve conflicts in installer_template.nsi
2023-06-28 11:02:11 -04:00
178fc5cbaa
Fixes for compatibility with new xcode 15 beta for any viewer branch after DRTVWR-577 ( #232 )
2023-06-07 16:16:06 -07:00
f57de07f73
Attempt to port some build.yaml improvements from DRTVWR-559 over to actions branch
2023-06-07 14:02:01 -07:00
19e9e8cf41
SL-18837: Try to silence cascade of Boost.Bind warning messages.
2023-06-05 12:32:10 -04:00
b5e1484c00
SL-18837: Windows APR 1.7.2 requires MS rpcrt4.dll.
2023-06-05 12:22:28 -04:00
a4a68c4f5e
SL-18837: We no longer build Windows apr-iconv -- don't reference.
...
With VS 2022 on Windows GitHub Actions runners, we can't build apr_suite at
all with the upstream .sln / .vcxproj files, so we had to switch to
"experimental" CMake support. However there's no CMakeLists.txt file for
apr-iconv, so the Windows package omits that library.
2023-06-05 10:39:34 -04:00
53c89d9723
SL-18837: Don't try to copy long, specific libnghttp2.14.19.0.dylib.
...
The package doesn't include that any more.
2023-06-02 16:30:28 -04:00
7efe727f26
DRTVWR-558: Merge branch 'main' of secondlife/viewer into actions
2023-05-19 10:43:14 -04:00
f45e888c90
Some small tweaks after merge with Viewer release
2023-05-17 11:31:45 -07:00
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
5ce70325ce
DRTVWR-559: Hard tabs considered harmful
2023-05-05 09:52:22 -04:00
7c1ccdc9a4
Merge pull request #179 from secondlife/brad/mac-nightly-builds
...
enable github actions mac nightly builds
2023-05-04 11:49:33 -07:00
c75b0079d9
Fix typo
2023-05-04 11:28:29 -07:00
7d23f91b16
Added ability to disable required OSX_SYSROOT cmake checks
2023-05-03 15:47:19 -07:00
9096c8d06f
Experiment with turning on MacOS builds for github based nightly builds for DRTVWR-559
2023-05-03 14:59:53 -07:00
2a10bd406c
DRTVWR-559: Replace debugLoggingEnabled() function with LL_DEBUGS().
...
The trouble with debugLoggingEnabled() is that it locked mutexes and searched
maps every time that call was reached. LL_DEBUGS() has the same functionality
(albeit with idiosyncratic syntax) but performs expensive lookups only once
per session, caching the result in a local static variable.
2023-05-03 09:55:31 -04:00
bb96ac2621
MErge with main after Viewer release
2023-05-02 09:39:03 -07:00
ff8dcc23bf
Merge branch 'main' into DRTVWR-577-maint-S
2023-05-02 17:39:37 +03:00
1444c4a23c
Merge branch 'main' into DRTVWR-582-maint-U
2023-05-02 17:39:13 +03:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
879ca2f6a0
DRTVWR-559 Disable unit tests by default.
2023-04-26 13:32:01 -05:00
f78773f0c9
SL-19623 Merge 'CMake' pull request #150 from Ansariel
...
Fix CMake files related to ICU4C
2023-04-19 20:12:48 +03:00
12e044755e
SL-19078: changes to autobuild to unpack the emoji/shortcode 3p library and then copy the XML files to the right place in the Viewer dev tree (indra/newview/skins/xui/*/emoji_characters.xml)
2023-04-10 17:01:10 -07:00
a0cdaa75a9
SL-18839: Add basic Github build
2023-04-10 16:17:51 -07:00
f1095d7831
Merge branch 'main' into marchcat/main-contrib-merge
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/en/strings.xml
2023-04-07 00:20:59 +03:00
6926368ff8
SL-18839: Add basic Github build
2023-04-05 15:44:24 -07:00
337d2f984f
Fix CMake files related to ICU4C
2023-04-04 03:32:40 +02:00
28b240fd7f
DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
2023-04-03 14:58:58 -07:00
982281b6cb
Fix Tracy linking after recent DRTVWR-559/main merge
2023-03-31 13:51:21 -07:00
1b6cd23abd
CMake and tests fixups after merge with main for DRTVWR-559
2023-03-30 13:46:00 -07:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
5217e6bfb7
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
Andrey Lihatskiy