Commit Graph

69051 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Mnikolenko Productengine a53ccb2379 SL-18136 fix for Japanese IME 2022-11-02 19:38:01 +02:00
Andrey Lihatskiy 791fb0ee56 SL-18533 Updated ToS XUI with new language 2022-11-02 19:08:05 +02:00
Ansariel 4ddcd783b2 Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer 2022-11-02 18:06:31 +01:00
Ansariel da8f95ad22 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-02 18:06:07 +01:00
Andrey Lihatskiy 67ce0e77d7 Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-Q 2022-11-02 18:50:18 +02:00
Callum Prentice 395a60a83e Merge branch 'master' into DRTVWR-568 2022-11-02 09:09:47 -07:00
Ansariel 7732257ea5 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-11-02 13:05:00 +01:00
Ansariel e17f341ce2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-02 12:59:19 +01:00
Ansariel 183c0c3d13 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-11-02 12:54:50 +01:00
Ansariel 10588d606e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-02 12:54:26 +01:00
PanteraPolnocy 498d8e92de A small cleanup: 'Move Create/Ungroup folder from selected menu items' in all applicable languages 2022-11-02 09:14:08 +01:00
Pantera 3139c1a43d FIRE-32365 Russian translation update, by Romka Swallowtail 2022-11-02 08:58:52 +01:00
Ansariel a60d6db797 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-11-02 00:37:49 +01:00
Andrey Lihatskiy 8c59cfd0bb Merge branch 'master' into DRTVWR-573-maint-R 2022-11-01 23:23:51 +02:00
Andrey Lihatskiy 9e9ae59b4f Merge branch 'master' into DRTVWR-565-maint-P 2022-11-01 23:23:22 +02:00
Andrey Lihatskiy 21079869fc Merge branch 'master' into DRTVWR-570-maint-Q 2022-11-01 23:23:04 +02:00
Nat Goodspeed 15b5dedb2d Increment viewer version to 6.6.8
following promotion of DRTVWR-575
2022-11-01 17:16:13 -04:00
Andrey Lihatskiy 31115dac2c Merge remote-tracking branch 'RyeMutt/viewer/minor-fixes' into DRTVWR-570-maint-Q 2022-11-01 23:12:58 +02:00
Andrey Lihatskiy 39e08b34b1 Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q 2022-11-01 23:11:57 +02:00
Ansariel 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
Beq 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
Beq 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
Ansariel 492a208b75 More simplifications 2022-11-01 16:21:27 +01:00
Ansariel c047a29b1e Actually simplify this 2022-11-01 16:16:12 +01:00
Ansariel 7b3dcfba3c Fix nullpointer guard 2022-11-01 16:14:56 +01:00
Ansariel 1bdfb7df70 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-01 15:16:40 +01:00
Brad Kittenbrink 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
Beq 707f8d5cbf Merge branch 'fixlogicerrorsintexturebatching' 2022-11-01 00:24:33 +00:00
Brad Kittenbrink 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
Beq 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
Beq 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
Beq 452f8fd9a0 clean up log tab output for mesh optimiser logs 2022-10-31 20:37:51 +00:00
Rye Mutt 0c36fed110 Correct macOS png loader to use a default gamma of 2.2 as apple has done since OS 10.6 2022-10-30 18:05:34 -04:00
Zi Ree 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
PanteraPolnocy c0980bd2fb FIRE-32346 French translation update, by Laurent Bechir 2022-10-30 21:20:47 +01:00
Zi Ree 66cecee628 Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop! 2022-10-30 20:30:12 +01:00
Rye Mutt 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
Rye Mutt 8669f3f4c2 Fix line editors deselecting when pressing capslock 2022-10-30 06:59:54 -04:00
Rye Mutt 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
Rye Mutt 971fd6f843 Fix use of deprecated CGDisplayAvailableModes with CGDisplayCopyAllDisplayModes 2022-10-29 23:18:35 -04:00
Rye Mutt d89033420e Fix RenderAppleUseMultGL debug setting for enabling threaded GL engine 2022-10-29 23:18:03 -04:00
Rye Mutt 83466b301a Clean up autorelease behavior in llwindowmac and additional leaks 2022-10-28 18:53:34 -04:00
Rye Mutt d628a537f5 Fix leaks in mac IME 2022-10-28 18:51:11 -04:00
Rye Mutt 97ea17e6e9 Fix leak of copy and paste on mac 2022-10-28 18:50:38 -04:00
Rye Mutt 662dd44587 Fix leaks in mac filepicker code 2022-10-28 18:49:32 -04:00
Rye Mutt 3dd874a99b Fix memory leaks in lldir objc/mac 2022-10-28 18:47:32 -04:00
Andrey Lihatskiy d4d5d4018d Merge remote-tracking branch 'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q 2022-10-29 00:32:59 +03:00
Rye Mutt 129301c8e9 Fix multiple leaks in the case of failure to deserialize animations 2022-10-28 15:46:42 -04:00
Rye Mutt fabfbb93e6 Harden LLDataPackerBinaryBuffer from performing invalid memcpy in case buffer is too small 2022-10-28 15:45:25 -04:00
Mnikolenko Productengine 27f7edeedb SL-16534 The link item is not updating after rezzing the linked object in-world 2022-10-28 19:55:40 +03:00