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
82d8b2a720
sl-20635 attempts at build fixes, added a few stray log messages about log file changes
2024-01-05 19:01:40 +00:00
516d7a890d
Add EOL, hopefully make pre-commit happy
2024-01-05 00:21:14 +00:00
7db1a5ce49
fail means fail
2023-12-27 19:12:38 +00:00
3777dbb3d6
More sl-20635 - moved new attachment data to AvatarAppearance message
2023-12-08 23:57:40 +00: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
108b46079a
SL-20473 Add GenericStreamingMessage and dummy handler to suppress packet loss and log spam noise when visiting GLTF enabled regions.
2023-10-16 16:21:20 -05:00
e3e1d42ab3
SL-20229 update message template hash
2023-09-11 09:31:16 -05:00
455bbcf742
SL-20229 Add GenericStreamingMessage and use it to receive GLTF material overrides
2023-08-29 16:42:55 -05:00
7d0dcf01df
only allow valid chars in bugsplat dbname
2023-08-28 00:23:03 +01:00
5c357d3690
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/stdtypes.h
# indra/newview/llimprocessing.cpp
2023-06-27 11:44:12 +02:00
7d05ade3f1
SL-18330: Merge branch 'main' of secondlife/viewer into xcode-14.3
2023-06-01 09:56:41 -04:00
ed92f1d803
SL-18330: Consistently use new standalone Python llsd package.
2023-05-31 16:34:04 -04:00
dd1940e9bc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-03 10:05:23 +02:00
407c2e59f7
Print out what package failed, m'kay?
2023-04-22 01:09:32 +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
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
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
7d5c93ce8b
Update GHA to improve handling of new 3p bundles.
...
also Update ubuntu to 20.04
deal with macOS being out of date (not to mention BSD)
handle case where some 3ps are generic (32/64)
2023-02-18 14:37:24 +00:00
3e96187edf
Improve GHA builds
...
- make sure we use the latest bundles provided
- rearrange things a little.
- make some initial steps towards trying to make things fail when config/build fails.
Improve OS/SL config switch
always use latest package version (by timestamp)
try another method that deals with not found (looking at you linux havok)
oops
I hate shell bl@*&y scripts
fix pattern
revert the autobuild version
wth
this makes no sense
fs-variables must be imported after the code
2023-02-18 14:37:24 +00: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
b5688b8b20
Update default URL for message template in template_verifier.py as well
2022-11-21 21:15:01 +01:00
242c8cb5ed
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/CMakeLists.txt
# indra/llprimitive/llmodel.cpp
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lllegacyatmospherics.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llworld.cpp
2022-10-25 11:49:36 +02:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
0789d9bddf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 01:41:17 +02:00
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
c607ff35d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/Python.cmake
2022-09-18 00:24:15 +02: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
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
55f51f4829
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-31 17:02:33 +02: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
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
5cdd8cdb6e
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-05-26 11:43:21 +02:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
b96f92f884
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-19 20:31:00 +02:00
b3bfe05494
SL-10025 - via Cathy Foil, all bones now have standard alias 'avatar_' + name.
...
# Conflicts:
# scripts/content_tools/anim_tool.py
2022-05-18 23:31:08 +03:00
307db06310
SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
# scripts/content_tools/anim_tool.py
2022-05-18 23:30:02 +03:00
cca7e12e1b
Bring packages formater step on par with 3p installation:
...
- When installing a 3P via use_prebuilt_binary it will pass --installdir=${AUTOBUILD_INSTALL_DIR} to
autobuild. On the other hand packages-formater was not passing this option, this could lead to subtle
errors when AUTOBUILD_INSTALL_DIR is different to what autobuild.xml stipulates.
2022-04-07 02:35:47 +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
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# 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-01 13:41:42 +02: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
Ansariel