Commit Graph

73499 Commits (c63b3eca4c014ea939a12da66c75e524985e2e5f)

Author SHA1 Message Date
Ansariel c63b3eca4c Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llurlregistry.cpp
#	indra/newview/llcontrolavatar.cpp
2024-03-01 21:00:56 +01:00
Ansariel 203ac04bf6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_stats.xml
2024-03-01 20:49:42 +01:00
Ansariel cb43d15c23 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	README.md
2024-03-01 20:07:23 +01:00
Ansariel e13ab75b9b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-01 20:05:51 +01:00
Andrey Kleshchev fe3be58938 SL-18721 Shutdown fixes #6 2024-03-01 18:20:01 +02:00
Andrey Lihatskiy 6d077c90a0 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-01 17:30:06 +02:00
Nat Goodspeed 701d1a33bb Increment viewer version to 7.1.4
following promotion of secondlife/viewer #673
2024-03-01 10:26:00 -05:00
Nat Goodspeed 1204468415 Merge DRTVWR-489 to main on promotion of Emoji viewer (#673). 2024-03-01 10:23:56 -05:00
Nat Goodspeed b42e01d7ac Reference updated action-gh-release@v1
instead of the branch that got pulled.
2024-02-28 08:45:12 -05:00
Andrey Kleshchev 18ec799992 SL-18721 Shutdown fixes #5 2024-02-27 23:14:44 +02:00
Andrey Kleshchev 44ea949079 Issue#900 Crash at LLInventoryAddItemByAssetObserver 2024-02-27 23:14:44 +02:00
nat-goodspeed 77b51cf953
Merge pull request #895 from secondlife/relnotes-w
Generate release notes from tag `release` to the built tag.
2024-02-27 10:15:18 -05:00
Andrey Kleshchev 563c35e1b4 Issue#894 Crash at load3 in cacheOptimize 2024-02-27 17:14:03 +02:00
Nat Goodspeed 27b298d8bc Base generated release notes on new floating tag 'release'
instead of on the current tag 7.1.2-release.
2024-02-26 17:05:56 -05:00
Nat Goodspeed 88ebb92f05 Leverage action-gh-release's new previous_tag input.
This should (!) allow us to generate full release notes relative to the
previous viewer release, instead of letting action-gh-release guess
incorrectly.

Also try again to add to the release page a back-link to the specific build.
2024-02-26 15:51:31 -05:00
Nat Goodspeed 4edd78f2e5 Try basing release notes on github.sha rather than github.ref_name. 2024-02-26 13:26:29 -05:00
Nat Goodspeed c6a6db8488 Try basing the GH release on github.ref_name instead of github.ref.
Using github.ref as action-gh-release's target_commitish produces:

⚠️ GitHub release failed with status: 422
[{"resource":"Release","code":"invalid","field":"target_commitish"}]
2024-02-26 12:20:31 -05:00
Nat Goodspeed a908b4cfa9 Try to generate release notes for this specific branch.
Also try to cross-reference release page and build page.
2024-02-26 11:23:47 -05:00
Andrey Kleshchev ae7b318e7f viewer#875 Crash at uri normalization
Note that crash happened when setting LLProgressView::setMessage
2024-02-23 19:18:23 +02:00
Andrey Lihatskiy ae6aa3fc41
Merge branch 'main' into DRTVWR-588-maint-W 2024-02-23 19:16:08 +02:00
Beq 575408d5cd FIRE-33381 (and others) Blurry textures on Mac 2024-02-23 00:30:04 +00:00
Beq 49b94804c5 Fix two separate bug splats due to unchecked pointers 2024-02-23 00:26:19 +00:00
Brad Linden 0f2248ea12
Improving issue templates. (#877)
making ordering explicit, and disabling blank issue submission to force
triage label to be set.
2024-02-22 13:01:49 -08:00
Vir Linden ffef19843b
Delete .github/ISSUE_TEMPLATE/issue_template.md 2024-02-22 11:28:44 -05:00
Vir Linden b9ac5e8433
Update issue_template.md 2024-02-22 11:26:54 -05:00
Vir Linden e452eeb816
Update issue_template.md 2024-02-22 11:24:55 -05:00
Vir Linden 0ad58e53ea
Merge pull request #873 from secondlife/vir-linden-issue-template
Create issue_template.md
2024-02-22 11:22:43 -05:00
Vir Linden 4b24b0d933
Create issue_template.md
Issue template for the "blank issue" option
2024-02-22 10:28:10 -05:00
Andrey Kleshchev da0f5ea0b4 Viewer#863 Crash reading xml 2024-02-22 01:36:10 +02:00
Andrey Lihatskiy 6ae83f06d8
Merge branch 'main' into DRTVWR-588-maint-W 2024-02-21 22:01:44 +02:00
Andrey Kleshchev 5e697cc04c SL-20469 Crash at dead mRootVolp in getAttachedAvatar() 2024-02-21 05:23:36 +02:00
Beq 3680898a03 Merge branch 'master' of ssh://github.com/FirestormViewer/phoenix-firestorm 2024-02-16 18:26:57 +00:00
PanteraPolnocy 6a287c1c88 Tiny change in Polish translation
This words fits better in reflection probes context
2024-02-16 17:27:48 +01:00
PanteraPolnocy 061a5a1341 FIRE-33700 French translation update, by Laurent Bechir 2024-02-16 17:27:05 +01:00
PanteraPolnocy dee91ff9cf Removing orphaned translation files without parents in /en/ directory 2024-02-16 17:09:53 +01:00
nat-goodspeed 54dfcd7502
Merge pull request #812 from secondlife/DRTVWR-588-relnotes
Engage new viewer-build-util/which-branch with relnotes output.
2024-02-16 10:06:30 -05:00
Beq d5e1b538d7 Update imported actions to remove deprecated JS dependency 2024-02-15 20:03:42 +00:00
Nat Goodspeed ff543b744e Engage new viewer-build-util/which-branch with relnotes output.
Put whatever release notes we retrieve into the generated release page.
2024-02-15 11:21:31 -05:00
Beq d64fce306b Fix RLV vision spheres not working properly in blur(2) mode. 2024-02-15 13:46:51 +00:00
Beq 7e3346829a Highlight Transparency was relocated, do that for all translations
and restore the rigged transparency entry while we are at it.
2024-02-15 13:25:23 +00:00
PanteraPolnocy 95ab7a7dd4 Fine-tuning Polish translation 2024-02-14 21:22:34 +01:00
PanteraPolnocy 6c6302b294 Yet another lightning -> lighting typo fixed 2024-02-14 20:48:07 +01:00
PanteraPolnocy 9baac6ea6c There is no sense having that "-" in front of this menu option without the "highlight transparency" selection that used to sit above 2024-02-14 20:46:31 +01:00
PanteraPolnocy 23b62889ce nav_stack to top_stack in all translations 2024-02-14 20:43:12 +01:00
Ansariel 77c3b05a17 Apply missing changes 2024-02-14 19:14:15 +01:00
Ansariel 58615ec5c3 Transplant changes 2024-02-14 19:09:32 +01:00
Brad Linden 255bb8504d
Update cla.yaml allowlist to clear spurious errors (#804) 2024-02-14 09:54:46 -08:00
Ansariel dd3b29d82c Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2024-02-14 18:05:08 +01:00
Ansariel 474cbf62cf Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-02-14 18:04:46 +01:00
Brad Linden bf2fb55fe7 Update cla.yaml allowlist to clear spurious errors 2024-02-14 17:17:58 +02:00