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
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
e7eced3c87
#824 Don't fix tabs in files with no tabs
2024-05-01 07:58:22 +03:00
d48497268e
#824 Add c,py,glsl to the script's default file types
2024-05-01 07:39:56 +03:00
af4ea94efc
#824 Add a script to convert tabs to spaces in the code files
2024-04-29 07:06:48 +03:00
b527620dfc
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-24 19:53:03 +02:00
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
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
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
adf35472f5
remove conditional for a compiler we can no longer use.
2024-04-01 22:44:32 +01:00
5c93f37775
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llrender.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewerwindow.cpp
2024-03-05 03:31:18 +01:00
65eec6d217
XML formatting tool - add LF before EOF
2024-01-18 23:30:43 +02:00
b9a2c8279f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-09 10:54:50 +01:00
c0abd01b17
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
2024-01-05 13:17:48 +01:00
7db1a5ce49
fail means fail
2023-12-27 19:12:38 +00:00
e341621a8e
Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llmemory.cpp
# indra/llui/lltooltip.cpp
# indra/newview/llagent.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-27 13:00:20 +01:00
c58a1544bc
Merge branch 'DRTVWR-591-maint-X' of H:/ViewerDev/viewer-591
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerparceloverlay.h
2023-11-30 19:31:04 +01:00
c409236dac
Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge
...
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-11-30 18:09:29 +02:00
27dae1d967
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30 13:30:27 +02:00
9bf5ad98e5
XML formatter script - simplify the default declaration
2023-11-24 09:49:19 +02:00
6e63fe32ef
XML formatter script - added control for the declaration tag
2023-11-24 09:40:27 +02:00
2c93819d27
XML formatter script - added license
2023-11-21 00:16:33 +02:00
586da70a5a
Added the script for adjusting XUI xml format
2023-11-20 10:47:30 +02:00
4d4abdd769
SL-20579 Added "--outfile" and "--files" options to the translation export script
2023-11-08 05:45:53 +02:00
242c378df9
SL-20473 Add GenericStreamingMessage and dummy handler to suppress packet loss and log spam noise when visiting GLTF enabled regions.
2023-10-28 13:34: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
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
Ansariel