8254407854
Merge branch 'main' into main
2023-05-02 21:11:10 +01:00
ccb1dfa072
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2023-05-02 20:11:20 +02:00
a651642e6a
Linux: Build fix
2023-05-02 19:38:39 +02:00
534d3abd2a
Fixing a small typo in llviewerstats.cpp
2023-05-02 19:35:14 +02:00
d1e3959fef
Update floater_scene_load_stats.xml
...
Reducing the packet loss...
2023-05-02 19:19:03 +02:00
181ddc6776
Updated Polish translation, minor adjustments in English one
2023-05-02 19:07:15 +02:00
523662a5c8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 18:22:32 +02:00
14ef415ac5
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
2023-05-02 17:52:17 +02:00
2a6c81f1d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 17:52:00 +02:00
bbfe4a2534
Merge branch 'main' of https://github.com/secondlife/viewer
2023-05-02 17:13:48 +02:00
f7dda591ba
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 17:13:36 +02:00
ff8dcc23bf
Merge branch 'main' into DRTVWR-577-maint-S
2023-05-02 17:39:37 +03:00
504ef7e9e3
Merge branch 'main' into DRTVWR-580-maint-T
2023-05-02 17:39:29 +03:00
7ed52090a6
Increment viewer version to 6.6.12
...
following promotion of DRTVWR-539
2023-05-02 10:24:54 -04:00
e6ec5ccb2e
Remove "experimental" label
2023-05-02 13:43:23 +02:00
4cba6ee94a
Of course it got screwed up...
2023-05-02 13:39:09 +02:00
7c3a8c2a9f
Update German translation
2023-05-02 13:30:33 +02:00
ed07f51839
Don't create Python byte code and __pycache__ directory
2023-05-01 18:02:38 +02:00
a9ef72eb55
FIRE-32915 Russian translation update, by Romka Swallowtail
2023-05-01 14:39:58 +02:00
0ecac64c2a
Delete orphaned files
2023-05-01 13:36:52 +02:00
59507ebd7f
Fix a bunch of warnings related to profiles
2023-05-01 13:35:40 +02:00
b8cb3845dd
FIRE-32913 - fix crash when image to be uploaded is invalid in some way
2023-05-01 02:52:57 +02:00
14e92f6b0d
missing format string
2023-05-01 00:12:03 +01:00
4ae5a8965f
BUG-233797/BUG-233798 -ve underwater fog density causes blackout.
2023-04-30 11:52:22 +01:00
4a1dcaac82
BUG-233797/BUG-233798 -ve underwater fog density causes blackout
2023-04-30 11:38:45 +01:00
3a79977bcf
Rework deployment script to unpack and support discord webhook
...
need to fetch the script
Make script more tolerant of errors.
Fix extraction of build_type for GitHub layout
Need to ignore pre-existing folders
We have multiple artifacts that we are merging into a common tree.
despite the clash of folders the files are not going to clash.
revert the artifact collection to per platform.
Simplify 64/32 test to remove ReleaseType dependency
2023-04-30 11:11:22 +01:00
650404903d
Build and Deploy
...
build and collect the artifacts then deploy once all builds complete
Add rclone setup
2023-04-28 09:56:56 +01:00
5aeae33677
Step one to enable nightlies
2023-04-26 01:15:25 +01:00
895ce616ea
SL-19652 Fixed 'working' cursor flicker
2023-04-25 22:49:33 +03:00
1491eea28c
SL-19652 Folder fetch dupplicate protection and over limit handling
2023-04-25 22:47:31 +03:00
b6f55f514f
Fix linux build
2023-04-24 12:29:56 +02:00
1aba1c157a
Fix linux build
2023-04-24 12:29:20 +02:00
1ded14fa3d
Fix linux build
2023-04-24 12:28:00 +02:00
3f5b988b10
Oooohhhhh civilians... Imagine SLURLs from external sources opening a new viewer and you can't find the simple cause for this... But actually replace some magic numbers with an enum in this commit :)
2023-04-23 01:39:28 +02:00
0d5282a99e
Add missing build targets
2023-04-22 18:55:00 +02:00
7e563d3120
Sync autobuild with upstream
2023-04-22 18:54:59 +02:00
054d2e1d33
Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-04-22 18:54:43 +02:00
3db023ce4d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-04-22 18:51:56 +02:00
107b1d00ed
SL-19636 Profile badges
2023-04-22 17:50:45 +03:00
fb23b7607a
Add missing build targets
2023-04-22 02:04:23 +02:00
d3dc0e1e27
Add missing build targets
2023-04-22 02:01:37 +02:00
0c87b49d3d
Sync autobuild with upstream
2023-04-22 01:44:53 +02:00
a514fa7b19
Sync autobuild with upstream
2023-04-22 01:43:09 +02:00
407c2e59f7
Print out what package failed, m'kay?
2023-04-22 01:09:32 +02:00
cffd703135
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicevivox.cpp
2023-04-21 19:43:30 +02:00
763ae4b613
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llimagegl.cpp
2023-04-21 18:40:10 +02:00
685607f155
Sync llserialize with upstream - tired of the 376486836th merge conflict about this
2023-04-21 17:06:56 +02:00
94a7b3ab8e
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
2023-04-21 15:14:43 +02:00
76e3d31179
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-04-21 15:10:54 +02:00
62730c5d41
Fix bug in German translation
2023-04-21 14:25:44 +02:00
Beq Janus