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

69051 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Andrey Lihatskiy 027dbc2ccf Merge branch 'DRTVWR-543-maint' into DRTVWR-543-maint_cmake 2022-05-27 19:06:11 +03:00
Andrey Lihatskiy a426e8ddb3 DRTVWR-543 post-merge cleanup 2022-05-27 19:05:14 +03:00
Andrey Kleshchev d4a799a1a8 SL-15312 Online status 2022-05-27 17:55:04 +03:00
Ansariel 69f60f59a2 Manually apply [PATCH] SL-17356 Viewer changes for Premium Plus support 2022-05-27 13:06:07 +02:00
Ansariel 08ac3d1118 Update German translation 2022-05-27 12:56:05 +02:00
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 32058405e1 Merge branch 'DRTVWR-543-maint' into DRTVWR-543-maint_cmake 2022-05-27 03:58:31 +03:00
Andrey Lihatskiy 8bfd7e16f8 post-merge build fix 2022-05-27 03:22:22 +03:00
Andrey Lihatskiy b2ef95522f Merge branch 'DRTVWR-543-maint' into DRTVWR-543-maint_cmake 2022-05-27 02:53:34 +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
Andrey Kleshchev 4cfa59d3f1 SL-17473 Viewer not clearing all Vertex Buffers in some cases 
Image thread doesn't need mBuffer and buffer isn't thread safe so no point allocating it in an image thread.
 2022-05-26 22:43:12 +03:00
Ansariel 3e14f539c6 FIRE-31688: Fix Shared Environment button in Phototools not working 2022-05-26 21:16:49 +02:00
Nicky 78e069f5e8 Merge remote-tracking branch 'remotes/origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake 2022-05-26 12:17:09 +02:00
Ansariel 7cc7b74778 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-05-26 11:48:40 +02:00
Ansariel 5cdd8cdb6e Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-26 11:43:21 +02:00
Ansariel 1ec5e9d0a0 Update German translation 2022-05-26 11:40:27 +02:00
Ansariel ee3f663b00 Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer 2022-05-26 11:38:12 +02:00
Ansariel b61dfd131d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-26 11:36:16 +02: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
Andrey Lihatskiy 58a500bee8 Merge branch 'master' into DRTVWR-561-maint-O 2022-05-26 03:07:14 +03:00
Andrey Lihatskiy 91606c7b60 Merge branch 'master' into DRTVWR-548-maint-N 2022-05-26 03:07:05 +03:00
Andrey Lihatskiy 2ed401882e Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
 2022-05-26 02:56:29 +03: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
Mnikolenko Productengine e6245adce8 SL-17462 soften colors of the prims on mini-map 2022-05-25 19:18:51 +03:00
Beq 69ad8212f3 [OPENSIM] Make sure the correct UUID is used for library 2022-05-25 17:15:03 +01:00
Mnikolenko Productengine ef7254a68a SL-17206 Unable to move an avatar after a strong fall on the ground 2022-05-25 16:15:14 +03: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
Andrey Kleshchev bc495fe39a SL-17458 Cut works the same way as Copy when pasting into Favorites 2022-05-25 00:31:48 +03:00
Howard Stearns f55c1ff405 SL-15937 - forget the +1 2022-05-24 09:33:06 -07:00
Howard Stearns 10f56db475 SL-15937 - far must be greater than near near, not equal 2022-05-24 07:04:54 -07:00
Howard Stearns 8ef25a63bd SL-15937 - adjust memory limit / cache code 2022-05-23 19:49:18 -07:00
Andrey Kleshchev 23d310436a SL-15312 Change permission status to be icons instead of buttons 2022-05-24 00:35:22 +03:00
Andrey Kleshchev f15ad900e4 SL-15312 Added new group visibility icons 2022-05-24 00:15:51 +03:00
Mnikolenko Productengine 7345cd1662 SL-17339 Controls > Restore Defaults should clear the "Walk to" action. 2022-05-23 20:26:25 +03: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
Nicky d95bb8d87c Merge branch master 2022-05-21 20:51:04 +02:00
PanteraPolnocy 88e5016e60 Updated Polish translation 2022-05-21 19:14:07 +02:00