4451c3f420
coding policy fixes
2024-02-08 18:34:00 -08:00
48a20c5337
Use webrtc built binaries from temporary s3 location
2024-02-08 18:34:00 -08:00
8fa09570ec
Updates to build on mac.
2024-02-08 18:34:00 -08:00
a80f6070a2
Pull webrtc down from a webserver before building.
2024-02-08 18:34:00 -08:00
0ae8bbaf5d
Checkpoint WebRTC Voice
2024-02-08 18:34:00 -08:00
9921407875
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/newview/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llstartup.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/viewer_manifest.py
2024-02-09 01:42:36 +01:00
762855f255
SL-19585 Try replacing fmod with openal
...
Since now VLC is responsible for played parcel media (should be since
SL-19042) should be possible to switch remaining audio to OpenAL with
no loss of functionality
2024-02-09 01:31:50 +02:00
78dc1c872a
Enable OpenAL Soft on MacOS
2024-02-09 01:31:50 +02:00
a831237e29
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# indra/llkdu/llimagej2ckdu.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# scripts/messages/message_template.msg.sha1
2024-02-06 17:58:20 +01:00
da967da9c7
Rename OS X to macOS, mostly in comments
...
We only support 10.13+ now, and it's been called macOS since 10.12. References in code to older versions are unchanged.
2024-01-11 19:11:33 +02:00
b32cd27b4c
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/cmake/ViewerMiscLibs.cmake
# indra/llmath/llvolume.cpp
# 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
# indra/newview/llviewermenu.cpp
2023-12-18 19:25:49 +01:00
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
50c7296d34
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
2023-12-01 11:27:42 +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
70db255e02
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llcommon/tests/workqueue_test.cpp
# indra/newview/VIEWER_VERSION.txt
2023-10-27 11:52:59 +02:00
51a6a0b954
Fix build
2023-10-26 22:11:12 +02:00
5f9fb4a395
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
# indra/newview/installers/darwin/release-dmg/background.jpg
# scripts/messages/message_template.msg.sha1
2023-10-26 21:25:27 +02:00
4a8fd7423d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/llcommon/tests/llleap_test.cpp
2023-10-26 21:16:03 +02:00
39a6735fc9
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/APR.cmake
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/viewer_manifest.py
# indra/test/namedtempfile.h
2023-10-26 15:49:12 +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
e30db83761
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
2023-10-11 15:56:04 +02: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
ff5645511e
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Python.cmake
# indra/newview/llvovolume.cpp
2023-09-09 11:40:54 +02: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
f075bf7599
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build_viewer.yml
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewerregion.cpp
2023-08-31 18:09:40 +02:00
512d450fe3
Fix CMake CMP0148 deprecation warning introduced with CMake 3.27.4
2023-08-31 18:59:23 +03:00
37d04235fe
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-08-30 14:38:51 +02:00
208a896f3f
Fix CMake CMP0148 deprecation warning introduced with CMake 3.27.4
2023-08-28 16:06:15 +02:00
701cf51cd7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# 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-25 02:57:48 +02: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
5dd820c22d
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
2023-07-29 14:35:11 +02:00
682535dd16
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/llcommon/stdtypes.h
2023-07-19 10:27:16 +02: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
317d4f7b0e
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/installers/windows/installer_template.nsi
2023-07-04 14:48:18 +02: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
ce7b2e96d0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llinventory/llsettingssky.cpp
# indra/newview/llpathfindingnavmesh.cpp
2023-05-18 12:25:20 +02:00
d927ba575a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llqueuedthread.h
# indra/llcommon/lluuid.cpp
# indra/llcommon/llworkerthread.cpp
# indra/llimage/llimageworker.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
2023-05-17 21:40:54 +02: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
38023d741e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-17 18:05:14 +02:00
8e9b3a8f37
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/pipeline.cpp
2023-05-12 12:06:57 +02:00
5ce70325ce
DRTVWR-559: Hard tabs considered harmful
2023-05-05 09:52:22 -04:00
9057bfc995
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/llinventory/llsettingssky.cpp
# indra/llmath/llvolume.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llviewerstats.cpp
# indra/newview/llvoavatar.cpp
2023-05-05 12:35:33 +02: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
abc44d584e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-05-03 14:14:14 +02:00
5572a4c392
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
2023-05-03 13:11:42 +02:00
dd1940e9bc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-03 10:05:23 +02:00
a651642e6a
Linux: Build fix
2023-05-02 19:38:39 +02:00
bb96ac2621
MErge with main after Viewer release
2023-05-02 09:39:03 -07:00
2a6c81f1d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 17:52:00 +02: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
ffa21ae649
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_linux.txt
# indra/newview/fsfloaterperformance.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-04-28 00:39:47 +02: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
3db023ce4d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-04-22 18:51:56 +02:00
719a2d31dc
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llui/llscrolllistctrl.h
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/textures/textures.xml
2023-04-22 12:02:23 +02:00
8ffa65d424
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-04-22 11:54:28 +02:00
9b93864eb9
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llstartup.cpp
# indra/newview/llurldispatcher.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-04-21 14:22:42 +02:00
da32456165
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/skins/default/xui/en/strings.xml
2023-04-21 12:38:19 +02:00
7dfe73540c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-04-21 12:23:05 +02: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
9ffb2514db
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llviewermenu.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-04-17 10:01:32 +02:00
a6693e9c9e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
2023-04-16 18:59:53 +02: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
2b6d9801bb
Remove obsolete HAS_GROWL compile definition
2023-04-06 12:40:16 +02:00
766acfa818
More CMake cleanup
2023-04-06 11:43:15 +02:00
6926368ff8
SL-18839: Add basic Github build
2023-04-05 15:44:24 -07:00
b0b1d592ea
Modernize Discord CMake
2023-04-05 13:14:08 +02:00
9825c45335
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/ViewerMiscLibs.cmake
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-04-05 10:56:12 +02:00
83c45e8237
Linux: Minor cmake cleanup in MediaPluginBase, no longer needs glib
2023-04-04 13:46:06 +10:00
ff3aa5f436
Linux: take out glib dependency from volume catcher, restore cef functionality, some cmake cleanup by PorkChop
2023-04-04 05:38:46 +02: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
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
377ee00657
Remove some apparently orphaned CMake files
2023-04-01 19:36:01 +02:00
982281b6cb
Fix Tracy linking after recent DRTVWR-559/main merge
2023-03-31 13:51:21 -07:00
51d1cf67e0
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llvopartgroup.cpp
2023-03-31 22:36:07 +02:00
68e5f326b3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/GLEXT.cmake
# indra/cmake/LLCommon.cmake
# indra/cmake/LLMath.cmake
# indra/cmake/LLRender.cmake
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/llrender/llglheaders.h
# indra/llrender/llglslshader.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llface.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llxmlrpctransaction.cpp
2023-03-31 18:54:16 +02:00
afd49409a7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/FreeType.cmake
# indra/cmake/ViewerMiscLibs.cmake
2023-03-31 16:56:37 +02:00
1b6cd23abd
CMake and tests fixups after merge with main for DRTVWR-559
2023-03-30 13:46:00 -07: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
36fc36432d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/CMakeLists.txt
2023-03-30 12:20:59 +02: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
62a57b441a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-28 18:02:32 +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
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
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
f4182ddc7f
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-03-06 17:11:43 +01:00
f65cddf860
Merge branch 'contribute' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llviewerwearable.h
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/da/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/floater_perm_prefs.xml
# indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
# indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/floater_perm_prefs.xml
# indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ja/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/pl/floater_about.xml
# indra/newview/skins/default/xui/pl/floater_about_land.xml
# indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
# indra/newview/skins/default/xui/pl/floater_associate_listing.xml
# indra/newview/skins/default/xui/pl/notifications.xml
# indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
# indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/pl/panel_profile_pick.xml
# indra/newview/skins/default/xui/pl/panel_profile_picks.xml
# indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/pl/panel_region_access.xml
# indra/newview/skins/default/xui/pl/panel_script_experience.xml
# indra/newview/skins/default/xui/pl/strings.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
# indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
2023-03-01 12:54:24 +01:00
7731ee8d50
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
2023-02-28 12:44:49 +01:00
7d4b0cd657
Updated tracy packages and config for tracy-v0.8.1 for SL-18563
2023-02-10 16:02:24 -08:00
3fd8bc04c2
Upgraded tracy package and enabled for mac with USE_TRACY for work on mac perfomance SL-18563
...
```
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110561/960415/tracy-v0.7.8.578230-darwin64-578230.tar.bz2 " hash="70f31fa71ecb52bd092da52e27c3ff8c"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110562/960424/tracy-v0.7.8.578230-windows-578230.tar.bz2 " hash="1dc33422939adf015db85e96c5a8276e"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110563/960429/tracy-v0.7.8.578230-windows64-578230.tar.bz2 " hash="fcc6ecece2ecb65aa36500dfa9461fb3"
```
2023-02-10 11:26:14 -08:00
645cca9765
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-10 10:52:46 +01:00
3079cda486
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
# indra/newview/llvoicevivox.h
2023-02-10 00:50:19 +01:00
6c54c9f8a9
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
2023-02-09 22:33:52 +02:00
77afc073c5
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
2023-02-08 17:18:37 +01:00
7b563470fb
Merge branch 'main' into xcode-14.1
2023-02-08 14:56:38 +01:00
62b11fc825
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/llappviewer.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/lltoolcomp.h
# indra/newview/lltoolfocus.h
# indra/newview/llviewerhelp.h
# indra/newview/llvoicevivox.h
2023-02-04 13:39:11 +01:00
fb727de6e3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llmeshrepository.cpp
2023-02-03 22:33:41 +01:00
2ff9900cd9
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-03 20:57:40 +01:00
24db83c554
Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llfloaterpreference.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llstartup.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_performance.xml
# indra/newview/skins/default/xui/en/panel_performance_complexity.xml
# indra/newview/skins/default/xui/en/panel_performance_huds.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
# indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
2023-02-03 17:15:04 +01:00
06ac6c615c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# doc/contributions.txt
# 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/llviewercontrol.cpp
# indra/newview/viewer_manifest.py
2023-02-03 15:34:47 +01:00
e07e23756d
Fix Linux build
2023-02-03 12:57:07 +01:00
73e5615d43
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
# indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
# indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
# indra/newview/llsettingsvo.cpp
2023-02-03 11:11:13 +01:00
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
e7ba1753d2
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-02-03 01:46:01 +02:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
6cbca4da71
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-01 11:40:17 +01:00
473ade2696
SL-19110 Fast hashing classes for use in place of the slow LLMD5, where speed matters. ( #64 )
...
This commit adds the HBXX64 and HBXX128 classes for use as a drop-in
replacement for the slow LLMD5 hashing class, where speed matters and
backward compatibility (with standard hashing algorithms) and/or
cryptographic hashing qualities are not required.
It also replaces LLMD5 with HBXX* in a few existing hot (well, ok, just
"warm" for some) paths meeting the above requirements, while paving the way for
future use cases, such as in the DRTVWR-559 and sibling branches where the slow
LLMD5 is used (e.g. to hash materials and vertex buffer cache entries), and
could be use such a (way) faster algorithm with very significant benefits and
no negative impact.
Here is the comment I added in indra/llcommon/hbxx.h:
// HBXXH* classes are to be used where speed matters and cryptographic quality
// is not required (no "one-way" guarantee, though they are likely not worst in
// this respect than MD5 which got busted and is now considered too weak). The
// xxHash code they are built upon is vectorized and about 50 times faster than
// MD5. A 64 bits hash class is also provided for when 128 bits of entropy are
// not needed. The hashes collision rate is similar to MD5's.
// See https://github.com/Cyan4973/xxHash#readme for details.
2023-01-31 22:04:14 +02:00
9438ef5f79
SL-19110 Fast hashing classes for use in place of the slow LLMD5, where speed matters. ( #64 )
...
This commit adds the HBXX64 and HBXX128 classes for use as a drop-in
replacement for the slow LLMD5 hashing class, where speed matters and
backward compatibility (with standard hashing algorithms) and/or
cryptographic hashing qualities are not required.
It also replaces LLMD5 with HBXX* in a few existing hot (well, ok, just
"warm" for some) paths meeting the above requirements, while paving the way for
future use cases, such as in the DRTVWR-559 and sibling branches where the slow
LLMD5 is used (e.g. to hash materials and vertex buffer cache entries), and
could be use such a (way) faster algorithm with very significant benefits and
no negative impact.
Here is the comment I added in indra/llcommon/hbxx.h:
// HBXXH* classes are to be used where speed matters and cryptographic quality
// is not required (no "one-way" guarantee, though they are likely not worst in
// this respect than MD5 which got busted and is now considered too weak). The
// xxHash code they are built upon is vectorized and about 50 times faster than
// MD5. A 64 bits hash class is also provided for when 128 bits of entropy are
// not needed. The hashes collision rate is similar to MD5's.
// See https://github.com/Cyan4973/xxHash#readme for details.
2023-01-31 18:42:51 +02:00
d9e82ab14a
DRTVWR-489-emoji: Pull in some small changes from Kitty's work to move the macOS build forwards
2023-01-26 17:04:35 -08:00
fb00bce81a
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
2023-01-26 10:37:59 -08:00
e2eda8c2bd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-01-25 14:41:15 +01:00
f9fbd0333a
DRTVWR-489-emoji: Update the machinery that copies over the ICU4C DLLs into the right place in Windows builds
2023-01-23 15:10:17 -08:00
9e3079f859
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontregistry.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/widgets/chat_editor.xml
2023-01-23 16:49:24 +01:00
aa895515b2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewercontrol.cpp
2023-01-19 18:50:52 +01:00
e60eb81d56
Linux: use system wide fontconfig instead of 3p library, if all goes well we can later remove it from autobuild.xml - patch by PorkChop, thank you!
2023-01-19 12:38:02 +01:00
a0ac418814
Let's add support for VS2022, shall we?
2023-01-17 15:59:44 +01:00
8d154eaa8c
Merge branch 'contribute' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/lldriverparam.cpp
# indra/llappearance/llwearable.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/newview/app_settings/settings.xml
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/skins/default/xui/de/floater_flickr.xml
# indra/newview/skins/default/xui/de/panel_flickr_photo.xml
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/fr/floater_flickr.xml
# indra/newview/skins/default/xui/fr/panel_flickr_account.xml
# indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
# indra/newview/skins/default/xui/it/floater_flickr.xml
# indra/newview/skins/default/xui/it/panel_flickr_photo.xml
# indra/newview/skins/default/xui/ja/floater_flickr.xml
# indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
# indra/newview/skins/default/xui/pl/floater_ban_duration.xml
# indra/newview/skins/default/xui/pl/floater_camera_presets.xml
# indra/newview/skins/default/xui/pl/floater_classified.xml
# indra/newview/skins/default/xui/pl/floater_create_landmark.xml
# indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml
# indra/newview/skins/default/xui/pl/floater_flickr.xml
# indra/newview/skins/default/xui/pl/floater_linkreplace.xml
# indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_my_environments.xml
# indra/newview/skins/default/xui/pl/floater_my_scripts.xml
# indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml
# indra/newview/skins/default/xui/pl/floater_pick_track.xml
# indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preview_trash.xml
# indra/newview/skins/default/xui/pl/floater_profile.xml
# indra/newview/skins/default/xui/pl/floater_settings_picker.xml
# indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml
# indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/panel_progress.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/ru/floater_flickr.xml
# indra/newview/skins/default/xui/ru/panel_flickr_account.xml
# indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
2023-01-13 15:19:29 +01:00
61a08406c7
SL-18892 FIXED Mac build fails locally
2023-01-04 20:27:12 +02:00
2b7ba3f904
Merge branch 'xcode-14.1' into contribute
2022-12-12 17:44:47 +02:00
2db96d32b8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-30 21:12:29 +01:00
ddfd54650e
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
2022-11-23 10:02:57 +01:00
57e8cd490f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-23 10:00:44 +01:00
8f45ad9323
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-22 16:29:17 +01:00
6c843bccda
Update message template URL after move to GitHub
2022-11-21 20:46:46 +01:00
026b8ff411
Update URL of message template
2022-11-21 20:40:50 +01:00
58a329be66
Merge branch 'DRTVWR-489-emoji' into DRTVWR-489-emoji
2022-11-16 20:16:28 +01:00
7ebaa2d2e5
Merge branch contribution/emoji into DRTVWR-489-emoji
2022-11-09 23:25:02 +01:00
24bd7b2311
Add support for OT-SVG fonts
2022-11-06 16:25:35 +01:00
a2a723f383
DRTVWR-575: Suppress remaining size_t truncation warnings for now.
2022-11-03 15:19:49 -04:00
206993f843
DRTVWR-575: Forbid Xcode 14.1 from implicitly signing every target.
...
Or rather, attempting to implicitly sign. On TeamCity we must explicitly sign
using viewer_manifest.py. On a developer system, without these changes, Xcode
produces many errors of the form:
error: An empty identity is not valid when signing a binary for the product
type 'Command-line Tool'. (in target 'INTEGRATION_TEST_lldir' from project
'SecondLife')
and refuses to compile anything at all.
Thanks to Rye Mutt and NickyD. Also thanks Geir Nøklebye for additional
settings to help tame Xcode 14.1 warnings.
2022-11-03 13:46:19 -04:00
da8f95ad22
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-02 18:06:07 +01:00
1bdfb7df70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 15:16:40 +01:00
b48f34b24c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 14:04:55 +01:00
66cecee628
Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop!
2022-10-30 20:30:12 +01:00
f4a99d354c
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-10-26 21:28:06 +02:00
ca53f265b4
Bump Teamcity for new Project Viewer build of DRTVWR-559
2022-10-25 14:28:35 -07:00
b4e8d7a7b2
Revert "SL-18390: speculative fix for broken notarization - part2"
...
This reverts commit 31917709d9
2022-10-23 20:08:46 +02:00
31917709d9
SL-18390: speculative fix for broken notarization - part2
2022-10-21 16:04:22 -07:00
2b65ae8215
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-10-15 17:33:22 +02:00
efb987f595
Run on windows-2022-large
2022-10-12 12:59:12 -07:00
d4506967ed
SL-16542 Openjpeg's header should have remained unchanged.
2022-10-04 17:53:43 +03:00
7b2fa92f0e
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/viewer_manifest.py
2022-10-04 14:17:44 +02:00
c844bf0ab8
SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and enable partial bitstreams
...
Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow.
I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way.
P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2022-10-01 11:25:14 +03:00
0d0d1572b1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-26 15:22:19 +02:00
8c552b767f
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/cmake/LLAddBuildTest.cmake
# indra/newview/CMakeLists.txt
2022-09-21 17:08:36 +02:00
5a353bb7b2
SL-17238 Small cleanup
...
Implied 'branch' is now two different version-control systems behind
2022-09-21 11:01:01 +03:00
bfe7cbb136
SL-17238 Merged in NickyD's cmake changes
2022-09-21 07:45:38 +00:00
a441ce184f
DRTVWR-568: Stop suppressing unused variable warnings -- we fixed?!
2022-09-20 14:27:11 -04:00
45aef2c318
Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled
2022-09-20 19:29:39 +02:00
c607ff35d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/Python.cmake
2022-09-18 00:24:15 +02:00
6924ce21a0
Python cmake hack for GHA (you will need python >3.9 now)
...
this is to get around the issue of windows on github finding the wrong python in cmake due to our existing hacks for cygwin.
2022-09-17 22:28:05 +01:00
b810ad3104
Merge test cleanup.
2022-09-17 23:26:52 +02:00
951034d7e6
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/00-Common.cmake
2022-09-17 23:14:56 +02:00
1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
7471788271
SL-17238 MacOS build does not recognize no-unused-but-set-variable
2022-09-17 19:30:31 +03:00
c7366f4c55
SL-17238 Fix coding policy build issues
2022-09-17 19:30:31 +03:00
e840b5eb40
MacOs packaging is weird, as Nat already did point out :(
...
Part of his change was omly taking Release builds into account, the other
part from me made the same mistake.
Use a generator expression with a custom command to get the symlink the way
we want.
2022-09-17 17:37:45 +02:00
8e0b039e55
Cleanup sweep
2022-09-17 17:14:16 +02:00
0e325eab28
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/Python.cmake
# indra/llcommon/llsd.h
# indra/llcommon/llstl.h
# indra/llinventory/llparcel.cpp
# indra/llmessage/llmessagethrottle.cpp
# indra/llui/lldockablefloater.h
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llwatchdog.cpp
# indra/newview/viewer_manifest.py
2022-09-17 14:37:33 +02:00
a35e58b719
SL-17238 MacOS build does not recognize no-unused-but-set-variable
2022-09-17 14:44:14 +03:00
0da3dd27fc
SL-17238 Fix coding policy build issues
2022-09-17 14:03:55 +03:00
8c1427c39f
Only set include property on ll::bugpsplat target when on Windows.
...
The include was preveiously declared for all platforms, but the Mac
package does not even ship this include directory. With the new way
cmake works this will lead to an error (which is good, so we don't
end with bogus include dirs).
2022-09-17 12:57:49 +02:00
7a71cea15b
Workaround to keep old cmake versions limping around.
2022-09-17 12:02:25 +02:00
68c680599b
Try to make sure this also works with the havok version of llphysicsextension.
2022-09-17 11:21:06 +02:00
554717044f
Rename MESHOPTIMIZER.cmake to Meshoptimizer.cmake as those caps honestly bug me.
2022-09-16 23:24:39 +02:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
5a78473123
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/skins/default/xui/en/menu_viewer.xml
2022-09-16 11:23:28 +02:00
1f176fdc18
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llglslshader.cpp
# indra/llrender/llpostprocess.cpp
# indra/llrender/llrender.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
2022-09-13 20:11:44 +02:00
d7c77e5c64
SL-18095 WIP -- Use meshoptimizer to re-weld and cache optimize after generating tangents
2022-09-12 11:48:16 -05:00
8b1f80c8ce
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-09-08 18:44:46 +02:00
8fb18e9a5d
SL-18095 Add missing Mikktspace.cmake
2022-09-08 11:17:27 -05:00
8ad7240a3b
SL-18095 WIP -- Add Mikktspace tangent generation for PBR materials and switch to per-pixel binormal generation. Still bugged with some test content.
2022-09-08 10:06:53 -05:00
5883ff178b
SL-17657: Merge branch 'more-c++17' into DRTVWR-568.
...
Converting on DRTVWR-568 as the project branch going forward.
2022-09-01 14:07:52 -04:00
675cfedb8a
DRTVWR-568: Ensure parent directory exists before CREATE_LINK.
2022-09-01 12:27:08 -04:00
2f42e999e0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 16:04:49 +02:00
ef58b9751a
DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming
2022-08-30 15:20:04 -07:00
29cf23c852
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-30 09:43:24 +02:00
5440464a9c
Merge branch 'contribution/emoji'
2022-08-28 00:08:38 +02:00
592abc460c
DRTVWR-568: More cleanup of deleted obsolete std library features.
2022-08-26 22:49:16 -04:00
94c571887b
DRTVWR-558: Streamline and generalize Windows Python search.
2022-08-23 17:21:31 -04:00
15d37713b9
DRTVWR-558: Fix builds on macOS 12.5 Monterey.
...
Always search for python3[.exe] instead of plain 'python'. macOS Monterey no
longer bundles Python 2 at all.
Explicitly make PYTHON_EXECUTABLE a cached value so if the user edits it in
CMakeCache.txt, it won't be overwritten by indra/cmake/Python.cmake.
Do NOT set DYLD_LIBRARY_PATH for test executables! That has Bad Effects, as
discussed in https://stackoverflow.com/q/73418423/5533635 . Instead, create
symlinks from build-mumble/sharedlibs/Resources -> Release/Resources and from
build-mumble/test/Resources -> ../sharedlibs/Release/Resources. For test
executables in sharedlibs/RelWithDebInfo and test/RelWithDebInfo, this
supports our dylibs' baked-in load path @executable_path/../Resources. That
load path assumes running in a standard app bundle (which the viewer in fact
does), but we've been avoiding creating an app bundle for every test program.
These symlinks allow us to continue doing that while avoiding
DYLD_LIBRARY_PATH.
Add indra/llcommon/apply.h. The LL::apply() function and its wrapper macro
VAPPLY were very useful in diagnosing the problem.
Tweak llleap_test.cpp. This source was modified extensively for diagnostic
purposes; these are the small improvements that remain.
2022-08-22 21:00:42 -04:00
78d8048f38
Add -Wno-unused-variable for Mac.
2022-08-14 19:56:40 +02:00
a9ddc09824
Split Linux warning supression into their own block, disable deprecation warnings thanks to our old boost library ...
2022-08-14 16:18:04 +02:00
e8179b39d9
Bring back -Wno-pragmas for older GCC versions.
2022-08-14 09:48:13 +00:00
b3ec34054a
Clean up compile definitions a bit
2022-08-13 12:05:46 +02:00
62ecb56640
Move viewer specific warnings from variables to viewer cmake.
2022-08-12 18:14:52 +02:00
fb975ad2f1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-10 14:10:21 +02:00
08acbbec54
Linux SDL2 - Make SDL2 default, remove USE__SDL2 flag, add USE_SDL1 flag instead to go back to SDL1 if needed
2022-08-09 14:48:20 +02:00
480c549ee0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 15:25:54 +02:00
6d09c9ff89
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 12:37:05 +02:00
3866fcfdc3
Streamline SDL1/SDL2 propgation and handle it in one place rather than having it multiple times
...
in the cmake files.
2022-08-04 00:46:42 +02:00
ede1eb93ab
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-02 13:55:55 +02:00
d7953c1e94
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-02 12:03:54 +02:00
b3c2c103d6
Fix Linux meshoptimizer library lining - use static .a instead of .o
2022-08-01 04:40:02 +02:00
00875f93d0
Restore GLOD alongside MeshOpt
2022-07-31 22:11:35 +01:00
3f31d0b5a7
Be more explicit: Rename use_conan_binary to use_system_binary, this will allow us to reuse the macro for more than just conan.
2022-07-17 17:51:25 +02:00
34ee11e0b8
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-07-07 10:53:58 +02:00
e32a4d3ed4
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-06-30 20:52:57 +02:00
3fcfa778ae
Handle variables for OSX signing a bit more graceful and do't force them
...
right into the cache.
See https://alexreinking.com/blog/how-to-use-cmake-without-the-agonizing-pain-part-2.html
2022-06-30 15:09:14 +02:00
adfc89c831
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 23:08:37 +02:00
fc11575657
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 20:28:29 +02:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
bd414ee0d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-29 17:21:22 +02:00
536e958018
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llface.cpp
# indra/newview/llfilepicker.h
# indra/newview/llinventoryicon.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
2022-06-27 17:58:22 +02:00
f76f1445f7
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-27 16:13:37 +02:00
6b85705951
fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed glext.h
2022-06-23 22:53:36 -07:00
31e2fa5e50
SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps).
2022-06-21 22:44:30 -05:00
9e003e13c3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-06-18 15:50:56 +02:00
db77862253
Enable signing for OSX.
2022-06-15 19:33:46 +02:00
8e4abf8ea3
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-06-10 13:52:52 +02:00
2dc376aa53
SL-17214 add 3p-tinygltf dependency to autobuild.xml
2022-06-08 13:33:59 -06:00
c08a61453b
Port new cmake files (Trace/Meshoptimizer) to modern cmake
2022-06-05 16:15:55 +02:00
59f6062685
Bring back comments for EXTERNAL_TOS and LL_IGNORE_SIGCHLD
2022-06-05 16:15:00 +02:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
7d7aff4377
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
e5c7fd4fff
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llrender/llgl.cpp
# indra/newview/llface.cpp
# indra/newview/llvovolume.cpp
2022-05-27 12:55:19 +02:00
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
Roxie Linden