f1443cd88e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-12-02 13:02:42 +01:00
de0dd5a11b
FIRE-32474 Russian translation update, by Romka Swallowtail
2022-11-28 09:33:46 +01:00
69a31fad4c
[FIRE-32453] [BUG-232971] disconnect sooner to force the cache write
...
The call to forceQuit sets the viewer state to Quitting. This triggers all the thread pools to exit, and to do so with no sense of orderly closure.
As a result the main window can exit which removes any visual indication to the user that work is still happening.
When the user then restarts, issues are caused because of temporary files that may still be in use.
It is possible too that the early closure of the mainwindow, allows the OS to terminate the process without prompting the user for a safe shutdown (unproven)
2022-11-27 23:02:59 +00:00
a7d55b4e77
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
2022-11-22 16:30:35 +01:00
8f45ad9323
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-22 16:29:17 +01:00
e231b6d8d3
SL-18689 Crash at LLTabContainer::selectNextTab()
...
FPE_NOOP at "idx = (idx + 1 ) % (S32)mTabList.size();"
2022-11-22 01:45:04 +02:00
25c62f554f
Merge branch 'master' into DRTVWR-570-maint-Q
2022-11-21 22:46:35 +02:00
026b8ff411
Update URL of message template
2022-11-21 20:40:50 +01:00
dbc70be7c4
Merge branch 'master' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
# autobuild.xml
2022-11-21 20:37:32 +01:00
7be4e2da47
FIRE-32446 French translation update, by Laurent Bechir
2022-11-20 22:34:00 +01:00
783926e124
Merge pull request #1 from FelixWolf/CZ-1
...
Various repo fixes
2022-11-18 14:22:49 -08:00
ee37ea4aa7
Renamed LICENSE.txt to follow naming scheme of other repos
2022-11-18 17:10:03 -05:00
f7f163f010
Merge pull request #3 from secondlife/signal/label
...
Add automatic PR labels
2022-11-18 08:42:14 -08:00
5c77f900ac
Merge pull request #2 from secondlife/signal/cla
...
Add CLA bot
2022-11-18 08:41:43 -08:00
e75104b066
Add automatic PR labels
2022-11-18 07:39:54 -08:00
eaf55065e2
Add CLA bot
2022-11-18 07:30:38 -08:00
a8ded3bcc4
SL-17135 Pull in apr-suit package
...
Same apr suit version, but with debug symbols
2022-11-18 14:43:54 +02:00
14f34041b8
Add copy of license to root directory so it is recognized by gh
2022-11-18 06:24:43 -05:00
35d2771cd3
Fix spelling error on license file name
2022-11-18 06:23:11 -05:00
4a33a0edb2
Fix readme logo for dark theme sites
2022-11-18 06:22:43 -05:00
6de62442e7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-17 21:59:35 +01:00
d5ed58a70e
Fix line widths: line widths > 1.0 are deprecated in current core profile, but not invalid; checking valid range should be sufficient if line widths > 1.0 will ever get removed in a future OGL version
2022-11-17 21:59:22 +01:00
5f44c2a5ff
SL-15869 Do not account for login menu when checking if key combination is avaliable
...
Ex: Allow mapping actions to Ctrl+Alt+D
2022-11-17 00:41:35 +02:00
e594db10c1
FIRE-32432 Russian translation update, by Romka Swallowtail (coalesced objects)
2022-11-16 20:40:13 +01:00
a96ed3097e
Revert "phototools2.1 integration" - needs more work and also causes merge conflicts somewhere else I'm not going to deal with multiple times
...
This reverts commit b213b4d4ae
2022-11-16 14:06:20 +01:00
986d5f44d4
Update German translation
2022-11-16 13:46:30 +01:00
cf96623c64
Updated Polish translation
2022-11-15 20:24:48 +01:00
a5df39feb1
FIRE-31369: Add inventory filter for coalesced objects
2022-11-15 19:01:46 +01:00
55103bff6d
Merge remote-tracking branch 'github/master'
2022-11-15 08:14:39 -08:00
73ca604ad5
SL-18618 Update libpng
2022-11-15 01:13:33 +02:00
06b56944af
Add some comment with example SLURL for "addgrid"
2022-11-14 12:34:02 +01:00
ef917cd5de
FIRE-32407 Russian translation update (minimap menu), by Romka Swallowtail
2022-11-13 21:18:44 +01:00
23863676d7
[FIRE-32414][BUG-232911][FIRE-32411] revert material shader changes
...
Reverting this shader file avoids the side-effects such as emissive mask alpha fail, and materials not working on certain transparent objects.
It also fixes the MAC ALM issue which was casued by MAC OpenGL being too lame to compile the previous emissive/alpha fix.
2022-11-13 14:32:56 +00:00
d2d5463916
Merge branch 'phototools2.1'
2022-11-13 14:28:15 +00:00
b213b4d4ae
phototools2.1 integration
2022-11-13 14:21:18 +00:00
1093c25d1d
Do not cut off buttons at the bottom of group banlist tab
2022-11-12 20:47:37 +01:00
e48fd7bbcc
Follow skin changes on Vintage for voice speaker controls
2022-11-12 19:48:09 +01:00
02c2a0aba3
FIRE-32403 Russian translation update, by Romka Swallowtail
2022-11-11 13:18:06 +01:00
cb10f3b149
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
2022-11-11 12:15:54 +01:00
970cde5be7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-11 12:08:30 +01:00
66b0ab656b
Fix shift+ctrl+. and shift+ctrl+, include select part in build mode
2022-11-09 00:41:13 +01:00
55c27641fe
Merge remote-tracking branch 'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q
2022-11-09 00:45:01 +02:00
2904062948
Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q
2022-11-09 00:41:58 +02:00
2cabc4f878
Make gcc happy, turn auto loop variables into references
2022-11-08 16:13:09 +01:00
da76a7bc73
Yeah, let's just do this...
2022-11-08 00:19:41 +01:00
d94343152d
Increase version after branching
2022-11-08 00:18:45 +01:00
9ac14566c2
FIRE-32377: Don't include own avatar when sharing items
2022-11-07 12:05:56 +01:00
520ebb392b
[BUG-232834][BUG-232871] Alpha mask is being applied with emissive mask
...
This is the most local fix for this issue, addressing the specific unqualified use of HAS_ALPHA_MASK.
If we find other issues with alpha mask being applied incorrectly then, it may be better to fix higher up in llvieweshadermgr.cpp by reverting the changes from SL-17532.
For now, this way works for this specific bug without non-emissive side-effects.
2022-11-05 22:37:14 +00:00
37d7b8a37c
[BUG-232834][BUG-232871] Alpha mask is being applied with emissive mask
...
This is the most local fix for this issue, addressing the specific unqualified use of HAS_ALPHA_MASK.
If we find other issues with alpha mask being applied incorrectly then, it may be better to fix higher up in llvieweshadermgr.cpp by reverting the changes from SL-17532.
For now, this way works for this specific bug without non-emissive side-effects.
2022-11-05 15:20:17 +00:00
1132c5742c
[FIRE-32359] [BUG-323869] Physics shape display in view incorrect
...
Fixes from upstream caused a partial reversion of an older bug.
meshes with a hull based (non triangle) user physics will not be convexified
when scaled to below 0.5m, viewer was failing to reflect that
2022-11-05 15:04:40 +00:00
Ansariel