02d9ba16c8
Let's add this back, too
2022-09-25 13:25:15 +02:00
d90263f4c4
No idea where these changes came from, but they break local Windows builds 100%
2022-09-25 13:19:48 +02:00
6569f18332
Apply GHA fixes from Nicky's branch that I managed to miss.
2022-09-23 11:23:19 +01:00
9e19e6712b
updates for GHA to get windows to work.
...
also requires python hackery pushed as separate commit pending a better solution.
2022-09-17 22:26:27 +01:00
718f9fdf7a
Set correct root project name and build type in CMake and don't use VSTool by default
2022-08-13 17:09:24 +02:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
c5e258f40f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 08:38:19 +01:00
1168b43580
Windows; use VS_DEBUGGER_WORKING_DIRECTORY to get rid of vstool if
...
possible. Enable by passing --no-vstool to configure
2022-02-26 13:55:14 +01:00
0aa59b2bee
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-22 13:40:40 +01:00
97a273e241
Make sure all bugsplat crashes land in one database per channel.
2022-02-18 22:31:31 +01:00
f0352ff093
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:49:24 +01:00
31e8e6fac0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-10 12:42:15 +01:00
c7f39b5043
Linux; bring back breakpad. No upload to bugsplat implemented yet.
2022-02-09 23:04:31 +01:00
b8bcbd9af5
For the moment nnly accept --crashreporting when building a windows viewer. Bugsplat on OSX yields in an unusable viewer (FIRE-31306) and Linux is without crash reporting.
2022-02-08 17:43:03 +01:00
ae2644535b
Linux; Do not build with OpenAL unless really requested.
2022-02-08 09:55:35 +01:00
89b5acfcbf
Fix broken message template check
2022-02-02 12:09:30 +01:00
abe4857fd3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 10:13:39 +01:00
61a842ee43
Debug builds are gone
2022-01-26 19:02:00 +01:00
08fe29a658
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-22 11:46:16 +01:00
55ce47676b
Add option to enable compiler cache (if found).
2022-01-17 18:25:04 +01:00
5929d4780d
Enable ninja build generator for all platforms
2022-01-17 16:54:33 +01:00
43614cfdaa
Remove obsolete scripts.
2022-01-17 14:38:04 +01:00
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
2ba4a164e2
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Python.cmake
# indra/lib/python/indra/util/llmanifest.py
# indra/lib/python/indra/util/test_win32_manifest.py
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcommon/llerror.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lleventnotifier.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewanim.h
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/de/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ru/menu_place_add_button.xml
# indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
# indra/newview/viewer_manifest.py
2021-12-16 12:32:34 +01:00
0b95b9d008
Merge branch 'master' into SL-15742
2021-12-11 10:29:37 -08:00
f729cfc33f
SL-15742: Convert build scripts to Python 3
...
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.
Breaking change: Python 2 support ending
Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.
Notes
- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
ef7f27b0d5
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-16 16:30:20 +01:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
3209ad92d6
DRTVWR-530 Mac buildfix: changed the license to opensource
2021-11-16 03:36:33 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
a42b5d6809
SL-15999 - made cwd handling a bit more robust in perfbot_run.py
2021-10-22 18:49:54 +01:00
e5cd9cb90f
merge
2021-10-22 18:11:48 +01:00
910daee888
SL-15999 - perfbot allow --num to default to number of creds
2021-10-21 14:31:03 +01:00
8af72281f5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 13:34:50 +02:00
b7009017c5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 13:01:21 +02:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
23ec0fb50c
SL-16124 - switch default region to Lag Me 5 now that it is set up and working
2021-10-01 15:22:22 -07:00
b3382719ad
SL-16124 First pass at a Python3 script to launch multiple non-interactive Viewers with differing command line options
2021-10-01 12:33:37 -07:00
ea32c0fba2
Strip off _x64 when converting channel > bugsplat db. We do not want x64 and x86 crashes in different databases.
2021-09-26 12:25:45 -04:00
69fd209c83
SL-13313 Updated message_template.msg.sha1
2021-08-31 22:27:45 +03:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
9718a38e9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 03:07:48 +02:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
5002c9caf4
Make the configure script smarter by automatically setting up bugsplat in case crashreporting is desire (and a channel is set).
2021-07-15 22:38:40 +02:00
fde4bd2cbc
SL-15177 Add slp-csv converting script
2021-05-12 15:07:17 +03:00
584ec4b4cc
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-22 07:31:19 +02:00
d2f76612a7
SL-15031 - more viewerstats.py support for cleaning up unused settings
2021-04-07 19:48:27 +01:00
Ansariel