Commit Graph

61854 Commits (6239f5b5d6448eada88e64803cae1828114c873a)

Author SHA1 Message Date
Ansariel 6239f5b5d6 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-18 18:26:28 +02:00
Ansariel 8ac53f8a76 Revert "Attempt to fix the VAAssetStorage pool creation issue" because of LL's upcoming ewwwww-hackme-fix
This reverts commit e7f5063944.
2020-08-18 18:25:34 +02:00
Ansariel 941dc882e2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-18 18:24:04 +02:00
Ansariel 0327874320 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2020-08-18 18:11:33 +02:00
Ansariel 460c88da8c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-18 18:11:13 +02:00
Andrey Lihatskiy 275188a7e3 Merge branch 'master' into DRTVWR-503-maint 2020-08-18 19:10:46 +03:00
Nat Goodspeed e8b31d03b4 Increment viewer version to 6.4.8
following promotion of DRTVWR-501
2020-08-18 12:02:30 -04:00
PanteraPolnocy a9c49febc0 Updated Polish translation 2020-08-18 16:42:59 +02:00
PanteraPolnocy 4a6e259844 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-18 16:31:31 +02:00
PanteraPolnocy 1fd476f111 FIRE-30025 French translation update (Phototools), by Laurent Bechir 2020-08-18 16:29:41 +02:00
Andrey Kleshchev e155122d62 SL-13626 Renamed PoolSizeAssetStorage to PoolSizeVAssetStorage
to reflect previous commit and use correct pool size
2020-08-18 15:34:11 +02:00
Andrey Kleshchev 58ba75f6dd SL-13783 Workaround for enqueueCoprocedure() crash #2 2020-08-18 16:23:59 +03:00
Ansariel 8a9c4101cb Fix seed cap retry count 2020-08-18 14:04:31 +02:00
Ansariel 8d3d45f767 Conversations floater: Rename "Info" button for groups to "Profile" since it opens the group profile 2020-08-18 08:22:27 +02:00
Ansariel 7588297f57 Correct KDU path 2020-08-18 07:34:32 +02:00
Nicky b6efe68d6d Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm 2020-08-18 01:24:02 +02:00
Nicky 37886282d4 KDU update. 2020-08-18 01:22:19 +02:00
Andrey Kleshchev fa0cc7b6d2 Merged in SL-13783 and SL-13789 2020-08-17 20:49:56 +00:00
Andrey Kleshchev 5ff63f0d7b SL-13789 Crash 'Enqueue failed' due to viewer requesting over 4K landmarks 2020-08-17 21:52:33 +03:00
Andrey Kleshchev 80fe2157fe SL-13783 Workaround for enqueueCoprocedure() crash with asset storage 2020-08-17 21:52:28 +03:00
Ansariel 729417c8d0 FIRE-24306: Retain cursor position when saving notecards 2020-08-17 15:28:26 +02:00
Ansariel 60ed2d9987 Only enable "Clear History" button in Preferences -> Privacy -> General if logged in since most (all?) data is per account 2020-08-17 13:05:56 +02:00
Ansariel 25632b406e FIRE-29761: Clear Location History does not clear Typed Locations history 2020-08-17 12:50:54 +02:00
Nicky 73da92d695 Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm 2020-08-17 01:18:32 +02:00
Ansariel 0c5fad0a10 FIRE-29994: Start location doesn't get updated when selection a destination from the login splash screen 2020-08-16 23:44:09 +02:00
Ansariel 5ae4be708a FIRE-30003: (CTRL-)F10 can't be used as gesture trigger 2020-08-16 22:49:26 +02:00
Ansariel 1002968742 AntiSpam: Only check for source ownership if the source is actually an object 2020-08-16 20:30:25 +02:00
Ansariel d34223da35 Exempt debug channel when checking for object chat spam 2020-08-16 20:24:44 +02:00
Ansariel 5bfdd8c042 Make FSUseAntiSpamMine debug setting actually work when checking for object sources 2020-08-16 20:13:02 +02:00
Ansariel 552c77d13e Fix AntiSpam checking the owner for object chat instead of the object itself in local chat 2020-08-16 20:11:23 +02:00
Ansariel e5b43d413c Update German translation 2020-08-16 19:17:26 +02:00
Beq f5cf69ee1d FIRE-29926 - Transition time for manual Env change 2020-08-16 14:59:58 +01:00
Tonya Souther 46bd337096 FIRE-30019: Remove clamp on shared media size on Linux 2020-08-14 18:32:11 -05:00
Tonya Souther 1e2730ccb9 Yet another FMOD Studio update for macOS. 2020-08-14 18:13:36 -05:00
Nicky 03e501031a Remove unnecessary include directives. 2020-08-14 21:12:56 +02:00
Nicky 51ca23d530 Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm 2020-08-14 19:09:31 +02:00
Nicky e989fdc5a0 Linux; Update to fmodstudio-2.01.03 2020-08-14 19:09:08 +02:00
Ansariel e7f5063944 Attempt to fix the VAAssetStorage pool creation issue 2020-08-13 20:33:26 +02:00
Ansariel 7a872c9c16 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-11 20:00:32 +02:00
Ansariel d5dd2c8aeb Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-08-11 19:52:44 +02:00
Ansariel b4635cc30d Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-11 19:19:00 +02:00
Ansariel 65713bc7c9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-08-11 19:17:42 +02:00
Ansariel ffd96d181a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2020-08-11 18:18:07 +02:00
Nicky 008936b986 Linux; update ogg vorbis. 2020-08-11 17:14:01 +02:00
Andrey Lihatskiy 9406b757a3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
#	indra/cmake/DirectX.cmake
#	indra/newview/llviewerparcelmedia.cpp
#	indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
Andrey Kleshchev 2e66c406d1 SL-13626 Renamed PoolSizeAssetStorage to PoolSizeVAssetStorage
to reflect previous commit and use correct pool size
2020-08-11 01:20:44 +03:00
Andrey Lihatskiy 6544826193 Merge branch 'master' into DRTVWR-501-maint 2020-08-10 23:59:32 +03:00
Nat Goodspeed 89cde15fb8 Increment viewer version to 6.4.7
following promotion of DRTVWR-476
2020-08-10 16:51:50 -04:00
Tonya Souther 742813e105 macOS build fixes. 2020-08-07 21:20:05 -05:00
Ansariel 7658becd8d Update FMOD Studio to 2.01.03 on Windows 2020-08-06 21:04:59 +02:00