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
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
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
1aa2535ae6
ignore the compiled glsl files as these should not be in version control
2022-11-05 15:01:18 +00:00
c4fef9edd0
Open help pages in external browser based on user's preferences.
2022-11-02 17:39:10 +00:00
7732257ea5
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-11-02 13:05:00 +01:00
e17f341ce2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-02 12:59:19 +01:00
498d8e92de
A small cleanup: 'Move Create/Ungroup folder from selected menu items' in all applicable languages
2022-11-02 09:14:08 +01:00
3139c1a43d
FIRE-32365 Russian translation update, by Romka Swallowtail
2022-11-02 08:58:52 +01:00
a60d6db797
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-11-02 00:37:49 +01:00
21079869fc
Merge branch 'master' into DRTVWR-570-maint-Q
2022-11-01 23:23:04 +02:00
15b5dedb2d
Increment viewer version to 6.6.8
...
following promotion of DRTVWR-575
2022-11-01 17:16:13 -04:00
31115dac2c
Merge remote-tracking branch 'RyeMutt/viewer/minor-fixes' into DRTVWR-570-maint-Q
2022-11-01 23:12:58 +02:00
39e08b34b1
Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q
2022-11-01 23:11:57 +02:00
9ee1a75474
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/skins/default/xui/en/floater_settings_debug.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
2022-11-01 17:17:56 +01:00
c79a5cda6e
[FIRE-32169] [Local Mesh] Add ? Help icon for local mesh
...
wiki pages TBD
* floater_local_mesh (just links to the three panels) and some general info.
* local_mesh_assets (description of the main asset list tab)
* local_mesh_log (description of the log tab)
* local_mesh_settings (descroption of the settings tab)
2022-11-01 15:30:27 +00:00
d5bc1d996a
[FIRE-32218] [Local Mesh] Crash when creating surrogate mesh after closing local mesh floater
...
don't rely on cached this pointer in the callback. Use the explictly stored floater_pointer instead
2022-11-01 15:27:17 +00:00
492a208b75
More simplifications
2022-11-01 16:21:27 +01:00
c047a29b1e
Actually simplify this
2022-11-01 16:16:12 +01:00
7b3dcfba3c
Fix nullpointer guard
2022-11-01 16:14:56 +01:00
1bdfb7df70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 15:16:40 +01:00
9d7b63b681
Fix SL-18511 TOS and MFA login failure handlers must cooperate to answer both reasons at the same time
2022-11-01 13:34:50 +01:00
707f8d5cbf
Merge branch 'fixlogicerrorsintexturebatching'
2022-11-01 00:24:33 +00:00
52b64bcfd7
Fix SL-18511 TOS and MFA login failure handlers must cooperate to answer both reasons at the same time
2022-10-31 14:17:05 -07:00
d066e8daf8
[FIRE-32269] rigged hair (esp. animesh) + batching fixes refactored
...
simplify logic
ignore empty material blocks where the alpha mode is blend
These should be treated the same as other alpha blend in order to batch properly
Fix for TE alpha breaking batches where material is set to alpha_mask
Two common occurences of this exist:
transparency huds that frequently are an afterthought
segmented bodies using alpha slicing.
2022-10-31 20:37:51 +00:00
2cc8e2ba06
FIX logic errors in texture batching
...
two errors result in poor use of draw buffers when batching alpha textures.
2022-10-31 20:37:51 +00:00
452f8fd9a0
clean up log tab output for mesh optimiser logs
2022-10-31 20:37:51 +00:00
d0380a6c16
FIRE-32151 - Move Create/Ungroup folder from selected menu items to a different spot in the menu and fix capital initials
2022-10-30 22:00:19 +01:00
c0980bd2fb
FIRE-32346 French translation update, by Laurent Bechir
2022-10-30 21:20:47 +01:00
66cecee628
Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop!
2022-10-30 20:30:12 +01:00
f3dd2bf95f
Fix menu checks for enabling object sit and touch to not traverse the entire menu holder to update labels
2022-10-30 07:00:01 -04:00
8669f3f4c2
Fix line editors deselecting when pressing capslock
2022-10-30 06:59:54 -04:00
d0e07c770b
Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type.
2022-10-30 06:56:16 -04:00
d4d5d4018d
Merge remote-tracking branch 'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q
2022-10-29 00:32:59 +03:00
129301c8e9
Fix multiple leaks in the case of failure to deserialize animations
2022-10-28 15:46:42 -04:00
fabfbb93e6
Harden LLDataPackerBinaryBuffer from performing invalid memcpy in case buffer is too small
2022-10-28 15:45:25 -04:00
91f9f2e9f7
DRTVWR-570 Mac build fix: unused variables cleanup
2022-10-27 23:08:09 +03:00
b2c5973fbd
DRTVWR-570 Mac build fix
2022-10-27 02:35:52 +03:00
b8f75bd161
Merge branch 'master' into DRTVWR-570-maint-Q
2022-10-26 23:58:06 +03:00
8b2b11d4a0
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-10-26 20:42:44 +02:00
a022452ff5
Increment viewer version to 6.6.7
...
following promotion of DRTVWR-574
2022-10-26 14:35:44 -04:00
cb32efeda2
Of course I meant that, stupid Mac...
2022-10-26 18:56:08 +02:00
3ac77d7338
SL-18438 Mac build fix
2022-10-25 19:49:37 +03:00
adffa86c6d
Merge remote-tracking branch 'RyeMutt/viewer/pod-uuid' into DRTVWR-570-maint-Q
2022-10-25 19:02:27 +03:00
7b3bb0f9c9
SL-17991 update tooltip over Clear History button
2022-10-25 17:16:57 +03:00
Ansariel