livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,997 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

66997 Commits (e5c7fd4fff6191c40a22ce9024c3592012b73f6f)

Author SHA1 Message Date
Ansariel e5c7fd4fff Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llrender/llgl.cpp
#	indra/newview/llface.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 12:55:19 +02:00
Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 11:41:45 +02:00
Andrey Lihatskiy 8bfd7e16f8 post-merge build fix 2022-05-27 03:22:22 +03:00
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 02:51:33 +03:00
Ansariel ca5a594e55 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-05-26 11:15:49 +02:00
Ansariel 95407836f5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-26 11:15:39 +02:00
Nat Goodspeed cdbd06e8ed Increment viewer version to 6.6.1 
following promotion of DRTVWR-546
 2022-05-25 19:22:09 -04:00
Beq f40059d429 [OPENSIM] BOM rebake can corrupt heap 2022-05-25 21:50:59 +01:00
Nicky 04c76e96ab Fix for OSX build (clang finding multiple overloads for operator==). 2022-05-25 20:58:51 +02:00
Beq 6244f77818 [OpenSim] top crashes in bugsplat due to abuse of varregions 2022-05-25 17:45:05 +01:00
Beq 3f564122a8 [OpenSim] BOM appearance loop test fix 2022-05-25 17:40:25 +01:00
Beq b3db5fca8b Ptolemy's well spotted oops 2022-05-25 17:27:25 +01:00
Beq 69ad8212f3 [OPENSIM] Make sure the correct UUID is used for library 2022-05-25 17:15:03 +01:00
Beq 06bde96503 FIRE-30562 [OPENSIM] Add GridStatus support 2022-05-25 02:52:37 +01:00
Beq 8070513312 UI change (checkbox toggle autofps) - Missed from an earlier commit 2022-05-25 00:22:53 +01:00
Beq 883890e3fb [FIRE-31674] [OPENSIM] Skip validatiion of suitcase and its contents 2022-05-25 00:17:30 +01:00
PanteraPolnocy 67aa3bd9ac Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-23 19:11:42 +02:00
PanteraPolnocy e5fb124a5c FIRE-31679 Fixing a small typo in English Phototools 
Found by Fritigern Gothly
 2022-05-23 19:11:30 +02:00
Beq f0f8ca75c2 Just ignore the suitcase as we can never be sure if it is expected. 2022-05-22 23:52:26 +01:00
PanteraPolnocy 8d052e5843 Correct delete_pref_preset name in all remaining languages 2022-05-22 17:17:11 +02:00
PanteraPolnocy b3ee2276ed FIRE-31677 French translation update, by Laurent Bechir 2022-05-22 17:16:40 +02:00
PanteraPolnocy 88e5016e60 Updated Polish translation 2022-05-21 19:14:07 +02:00
Ansariel 42c1ad0439 Don't include OpenSim "Suitcase" inventory folder in validation when connecting to SL 2022-05-21 17:04:18 +02:00
Ansariel 903a9fcdc6 Don't store inventory sort order in filters.xml file - LLParamSDParser stumbles over this which was probably the reason the sort order is stored in settings.xml anyways 2022-05-21 16:37:16 +02:00
Ansariel 111910d153 Add missing debug setting BrowserWebSecurityDisabled 2022-05-21 15:29:46 +02:00
Ansariel b01637e315 RenderAvatarVP setting doesn't exist anymore 2022-05-21 15:23:02 +02:00
Ansariel 1e78012357 Fix naming 2022-05-21 15:21:16 +02:00
Ansariel f2cc1e36b1 Fix XUI parser warning: LLUICtrl::initCommitCallback : No callback found for: 'Develop.ToggleProfiling' in control: Profiling 2022-05-21 15:17:31 +02:00
Ansariel 14b4c86cdf Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-20 16:40:29 +02:00
Ansariel b37161f9c2 Fix XUI parser warning 2022-05-20 16:40:18 +02:00
Ansariel 6f8175acd7 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-05-19 21:27:53 +02:00
Ansariel fb1c3d1a8c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-19 21:26:10 +02:00
Dave Parks 3365a39080 SL-17451 Fix for erroneous attempt to apply vertex color alpha to texture before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be). 2022-05-19 14:02:48 -05:00
Dave Parks bf183ecff7 SL-17449 Fix for Alexa's hair 2022-05-18 17:56:54 -05:00
Dave Parks c1deab5ba7 SL-17417 Fix for incorrect reflection orientation on fullbright prims. 2022-05-18 15:55:24 -05:00
Dave Parks a936322261 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-05-17 13:23:32 -05:00
Dave Parks 85b3f707d3 SL-17421 Fix for fullbright alpha mask shader ignoring vertex alpha 2022-05-17 13:23:08 -05:00
PanteraPolnocy 55394109d2 FIRE-31666 Updated Russian translation, by Romka Swallowtail 2022-05-17 16:26:52 +02:00
Andrey Kleshchev c6fe446c3a SL-17415 Movement of scripted attached objects is no longer interpolated. 2022-05-17 00:15:32 +03:00
Dave Parks c7ddba7eb4 SL-17417 Fix for incorrect reflection orientation on some moving child prims. 2022-05-16 16:02:38 -05:00
PanteraPolnocy 7b776e9f45 FIRE-31664, FIRE-31662 Updated French translation, by Laurent Bechir 2022-05-16 22:06:35 +02:00
PanteraPolnocy 3ae732093d Updated Polish translation 2022-05-16 21:42:49 +02:00
Ansariel 6e92093ee4 Fix localization issues and add German translation 2022-05-16 19:01:55 +02:00
Ansariel 309b1d2f16 We already know we're in OpenSim 2022-05-16 18:49:10 +02:00
Beq 9e99297898 Corrrrrrect spelling errrrrrror 2022-05-16 17:14:05 +01:00
Beq f1d4262ec1 [FIRE-31472] Allow some stats to be maintained when frame limiting. 2022-05-16 14:21:24 +01:00
Beq 30137a2ce8 FIRE-31634 [OPENSIM] Better inventory validation reporting 
Make the inventory reporting more user friendly
Make the options for fixing clearer
Make the nagging notification optional.
 2022-05-16 14:12:28 +01:00
PanteraPolnocy 3223bb7906 FIRE-31657: Ban filter translation update, for Russian (by Romka Swallowtail) and Polish 2022-05-15 00:06:02 +02:00
Ansariel d734801775 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-05-12 23:15:15 +02:00
Ansariel 924e347a6f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-12 23:07:12 +02:00