Beq
|
795f421e0e
|
More work on Tracy support
|
2024-07-01 21:04:06 +01:00 |
|
Beq
|
610dc70347
|
Tracy - include backtrace support required by Linux and Mac
|
2024-07-01 18:45:54 +01:00 |
|
Beq
|
7c519ee4d5
|
Tracy builds for Mac and Linux, maybe.
|
2024-07-01 14:54:03 +01:00 |
|
Ansariel
|
6adaf39c13
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
|
2024-06-05 11:25:09 +02:00 |
|
Nat Goodspeed
|
c1dc9b21df
|
Update tinyexr package to package based on secondlife/3p-tinyexr.
|
2024-06-04 16:55:44 -04:00 |
|
Ansariel
|
c3fe64e6be
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewermenu.cpp
# indra/newview/llvocache.cpp
|
2024-05-30 21:46:44 +02:00 |
|
Beq
|
891162d0a3
|
Fix a few things and update the autobuild to the new file
Tools for this version are https://3p.firestormviewer.org/Tracy.zip
|
2024-05-29 23:53:18 +01:00 |
|
Ansariel
|
343aeeeb36
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# doc/contributions.txt
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
|
2024-05-16 02:11:51 +02:00 |
|
Andrey Lihatskiy
|
d9153532b8
|
Merge branch 'main' into marchcat/x-mf-merge
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
|
2024-05-15 12:51:21 +03:00 |
|
Nat Goodspeed
|
094dcc07f8
|
Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X
|
2024-05-14 21:02:28 -04:00 |
|
Brad Linden
|
1e9e5a7b76
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-05-14 09:42:24 -07:00 |
|
Ansariel
|
f5d4e5f50a
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
|
2024-05-13 17:29:24 +02:00 |
|
Andrey Lihatskiy
|
e316f5cff9
|
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# autobuild.xml
|
2024-05-13 17:29:07 +03:00 |
|
Nat Goodspeed
|
85af619bbb
|
Reapply slvoice package URLs with autobuild 3.9.5
|
2024-05-10 09:10:18 -04:00 |
|
Nat Goodspeed
|
692a5eb2d3
|
Remove `creds=github` from slvoice platform entries.
https://github.com/secondlife/autobuild/issues/46
Also remove temporary `continue-on-error` setting.
|
2024-05-09 11:12:18 -04:00 |
|
Nat Goodspeed
|
3c023813dc
|
Update to S3-published GHA build of slvoice.
|
2024-05-06 12:34:41 -04:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Bennett Goble
|
9bf2dfbb39
|
Use s3 hosted slvoice autobuild dependencies
Pull SLVoice from s3 so that the OSS build configurations work.
|
2024-04-29 23:51:02 +03:00 |
|
Ansariel
|
f4250bcfaf
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llmanip.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llselectmgr.h
# indra/newview/pipeline.h
|
2024-04-24 22:05:15 +02:00 |
|
Ansariel
|
4a2790a987
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/app_settings/graphic_preset_controls.xml
|
2024-04-24 21:10:15 +02:00 |
|
Ansariel
|
af91e8a412
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
|
2024-04-24 19:54:13 +02:00 |
|
Ansariel
|
b527620dfc
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-24 19:53:03 +02:00 |
|
Brad Linden
|
86c0c1d553
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-04-24 09:55:34 -07:00 |
|
Andrey Lihatskiy
|
428f21cf79
|
Merge branch 'main' into marchcat/x-merge
|
2024-04-24 18:45:54 +03:00 |
|
Rye Mutt
|
e361671018
|
Port from OpenEXR to TinyEXR for reduced installer and library size (#1287)
|
2024-04-19 14:39:28 -05:00 |
|
RunitaiLinden
|
3ebf8761bc
|
Update autobuild.xml
|
2024-04-19 11:17:33 -05:00 |
|
Andrey Lihatskiy
|
355f231f0c
|
Merge pull request #1224 from nerodevo/autobuild-revert
Revert removal of llphysicsextension_stub for Windows
|
2024-04-16 21:58:36 +03:00 |
|
nerodevo
|
d06e000435
|
Change windows to windows64 again
Missed the second change... Here it is.
|
2024-04-16 11:08:23 -05:00 |
|
nerodevo
|
b04b4de465
|
Change windows to windows64
|
2024-04-16 10:52:24 -05:00 |
|
nerodevo
|
ae79615794
|
Revert "DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub."
This reverts commit d07cd115e3.
|
2024-04-13 06:31:38 -05:00 |
|
Ansariel
|
7355b798d2
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/lltexturefetch.cpp
|
2024-04-12 19:33:20 +02:00 |
|
Andrey Lihatskiy
|
eab5beb54c
|
Merge branch 'main' into marchcat/x-merge
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
|
2024-04-12 15:43:34 +03:00 |
|
Ansariel
|
2474e3ba1d
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
2024-04-10 10:03:37 +02:00 |
|
Ansariel
|
096aef2a72
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-10 01:49:35 +02:00 |
|
Brad Linden
|
5a47a3cb23
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-04-09 14:17:34 -07:00 |
|
Ansariel
|
bc2b88be93
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-09 19:46:31 +02:00 |
|
Pork Chop
|
06c8475d74
|
Linux: Remove obsolete gstreamer 0.10 3p package (superseded by existing gstreamer 1.x package), replace 3p dependency for icu4c and fltk with LL provided versions.
|
2024-04-06 06:01:37 +00:00 |
|
Ansariel
|
22d4c8b94d
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-02 19:35:40 +02:00 |
|
Pork Chop
|
26bdff6572
|
Linux: Update 3p library packages for SDL2, freetype and open_libndofdev
|
2024-04-01 09:48:54 +00:00 |
|
Pork Chop
|
8693cf763a
|
Linux: Consume LL provided 3p library dependencies since numerous linux64 builds for them are now available on github, remove unused bundled dependencies (SDL1 and FC)
|
2024-03-28 14:39:39 +00:00 |
|
Ansariel
|
77b6a6e978
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-03-27 15:32:45 +01:00 |
|
Ansariel
|
07b99632f3
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/llimage/llimagebmp.cpp
# indra/llimage/llimagetga.cpp
# indra/llrender/llrender.cpp
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/en/strings.xml
|
2024-03-27 12:48:58 +01:00 |
|
Ansariel
|
cbf6aca2e8
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# .github/workflows/build.yaml
|
2024-03-27 10:35:43 +01:00 |
|
Andrey Lihatskiy
|
990c8b81da
|
Merge branch 'main' into marchcat/yz-merge
|
2024-03-27 01:40:12 +02:00 |
|
Andrey Lihatskiy
|
1ae6f5dd6f
|
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
|
2024-03-27 00:33:40 +02:00 |
|
Andrey Lihatskiy
|
78174fc865
|
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
# .github/workflows/build.yaml
|
2024-03-27 00:14:56 +02:00 |
|
Ansariel
|
c111665779
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-03-26 22:29:40 +01:00 |
|
Ansariel
|
a8446ac624
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-03-24 21:52:26 +01:00 |
|
Ansariel
|
051c9bafc8
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-03-23 12:40:26 +01:00 |
|
Pork Chop
|
159b94d8ea
|
Linux: dullahan + cef - same version, replace with zstd compressed package instead.
|
2024-03-18 19:58:23 +11:00 |