Commit Graph

64956 Commits (962be69e7170a9f7e8a99b9da4eae22ea6cdb038)

Author SHA1 Message Date
Ansariel 962be69e71 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-15 18:19:56 +02:00
PanteraPolnocy 7f38a401d4 Updated Polish translation 2021-07-15 18:03:41 +02:00
Ansariel 4e3ecee43d Revert "Revert "FIRE-31031 New Create Landmark Floater: Default to Landmarks Folder""
This reverts commit ae3fc753f9.
2021-07-15 13:31:54 +02:00
Ansariel 8cec3063e0 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-07-15 13:30:18 +02:00
Ansariel b758c75584 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-15 13:30:05 +02:00
PanteraPolnocy c9d3c7a1ce FIRE-31066 Russian translation update (animations preview) 2021-07-15 12:38:57 +02:00
Ansariel 019f4f92f6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-15 12:31:22 +02:00
Ansariel 48012f1ce7 FIRE-31065: Make sure menu is shown on the screen properly 2021-07-15 12:31:11 +02:00
PanteraPolnocy 07894e24d9 FIRE-31063 Firestorm Credits update 2021-07-15 09:09:09 +02:00
PanteraPolnocy 154d5363eb FIRE-31064 French translation update, by Laurent Bechir 2021-07-15 08:45:05 +02:00
Nat Goodspeed be6066eae2 Increment viewer version to 6.4.22
following promotion of DRTVWR-516
2021-07-14 23:27:32 -04:00
PanteraPolnocy 8425d8c717 FIRE-31058 Russian translation update (rlva strings) 2021-07-13 20:28:05 +02:00
Nicky 8aab2b57dd Linux/OSX FMOD Studio 2.02.01 2021-07-13 20:15:03 +02:00
Ansariel 006e1ff01d FMOD Studio 2.02.01 for Windows 2021-07-13 14:13:25 +02:00
Ansariel ed4920f81c FIRE-31051: Hide empty folders in Places floater when filtering (again) 2021-07-13 13:44:30 +02:00
Nicky 0a47332aef Bump version to 6.4.22x 2021-07-13 00:39:06 +02:00
Kitty Barnett 7631d00bbf Merge branch 'master' 2021-07-12 23:20:29 +02:00
Kitty Barnett 021b1acde9 Merge branch 'rlva/development' 2021-07-12 23:20:05 +02:00
Kitty Barnett a610e5528a Merge branch 'rlva/bugfix/visual-effects' into rlva/development 2021-07-12 23:19:38 +02:00
Kitty Barnett cea6ca478c [FIXED] @setoverlay_touch stopped working with the introduction of @setsphere 2021-07-12 23:18:19 +02:00
Andrey Kleshchev 35f2b14c1d Revert "SL-15434 Change default landmark destination"
This reverts commit efc8b268a2.
2021-07-13 00:05:04 +03:00
Tonya Souther 07a9342d19 One more compile fix for Linux. 2021-07-12 11:14:28 -05:00
Kitty Barnett 6c12c804a4 Merge branch 'rlva/development' 2021-07-12 16:16:26 +02:00
Kitty Barnett 3016bb5252 The one where Linux does not let you have nice things and call them None... 2021-07-12 16:16:01 +02:00
Ansariel 9f86c1fc51 Update German translation 2021-07-12 09:00:28 +02:00
Beq f177e55ab5 make all the sunmoon edit labels slightly wider 2021-07-11 23:33:26 +01:00
PanteraPolnocy 88b4e690db Updated Polish translation (RLVa) 2021-07-12 00:23:44 +02:00
Kitty Barnett 331c6de052 Merge branch 'rlva/development' 2021-07-11 23:28:15 +02:00
Kitty Barnett fe5a2e717e [FIXED] Crash when @setsphere is issued with ALM enabled without shadows, ambient occlusion, depth of field, or antialiasing 2021-07-11 23:26:01 +02:00
PanteraPolnocy 8a339f09b8 FIRE-31050 [Vintage, Starlight] UI Bug: Inventory floater gets mis-aligned when resized 2021-07-11 21:14:03 +02:00
PanteraPolnocy 859595876a FIRE-31056 French translation update, by Laurent Bechir 2021-07-11 20:26:21 +02:00
Ansariel aaccc88f78 Update German translation 2021-07-10 22:28:05 +02:00
PanteraPolnocy e8c21a37d1 FIRE-31046 Italian - Legacy Profile - Account Info outside the box - one more string 2021-07-10 00:34:52 +02:00
PanteraPolnocy 7c4afbc4f0 Updated Polish translation 2021-07-09 22:59:14 +02:00
Beq 2a6f7208b3 [FIRE-31024] remove leftovers from unnecessary elements 2021-07-09 21:47:12 +01:00
Beq 9395448e99 FIRE-31024 - minimise vertical spacing in sun/moon panel 2021-07-09 21:04:27 +01:00
Beq ae2a138fce ignore vscode workspace files 2021-07-09 21:02:54 +01:00
PanteraPolnocy 26d1c3ed98 FIRE-31046 Italian - Legacy Profile - Account Info outside the box 2021-07-09 00:12:51 +02:00
Ansariel ec1e7bdd97 Remove SL references 2021-07-06 10:38:35 +02:00
Ansariel b6830d44a5 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-07-06 10:36:52 +02:00
Ansariel ae3fc753f9 Revert "FIRE-31031 New Create Landmark Floater: Default to Landmarks Folder"
This reverts commit ca97cd9b14.
2021-07-06 10:33:33 +02:00
Ansariel ec8bef8e9c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/cmake/bugsplat.cmake
#	indra/newview/llappdelegate-objc.mm
2021-07-06 10:32:52 +02:00
Ansariel a4e0fde3ee Shuffle stuff around 2021-07-06 09:50:32 +02:00
Nicky e6d4f07c2f Make GCC happy. 2021-07-05 16:07:36 -04:00
Nicky 8b5de6fc71 Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm 2021-07-05 15:17:16 -04:00
Nicky a45f1e35ee OSX; Bugsplat 2021-07-05 15:16:15 -04:00
Beq 98b19c8845 Additional static cache fixes to prevent purging 2021-07-05 14:46:55 +01:00
PanteraPolnocy 0963900844 FIRE-31043 Adjusted Japanese translation
Changes for Vintage skin and minor changes for Default skin.
2021-07-04 12:05:29 +02:00
Beq 3218fee7a5 Merge branch 'staticassets' 2021-07-04 00:27:12 +01:00
Beq cbe3910620 Cleanup cache clearing to re-enable threaded clear
fixup silly mis-edits
2021-07-04 00:12:13 +01:00