Commit Graph

353 Commits (353329c2c2e9e8fa1ff273de2016c9e155585f45)

Author SHA1 Message Date
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Dave Parks 4e8cd9437b SL-16193 Fix for mesh selection outline not rendering correctly (and broken physics shapes display). 2021-10-26 14:07:00 +00:00
Ptolemy 584a7f05df SL-16014: Add Tracy markup to LLSpatialGroup 2021-09-22 14:38:43 -07:00
Ptolemy a35544c701 SL-16027: Add Tracy OpenGL support 2021-09-21 16:10:52 -07:00
Dave Houlton 3cad30d9ee Merge branch 'master' into DV525-merge-6.4.18 2021-04-01 14:49:07 -06:00
Dave Houlton 10e95a60af SL-13490 replace imperfect object-relative normals with constant length 2021-01-29 12:05:29 -07:00
Dave Houlton 6564fce81a SL-13490 fix debug normals under non-uniform scale 2021-01-27 14:35:06 -07:00
Andrey Kleshchev 74c3b7a0ee Merged master (DRTVWR-507) into DRTVWR-514-keymappings 2020-11-11 22:16:04 +02:00
Andrey Lihatskiy a2cb61d9f4 Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
#	indra/newview/pipeline.cpp
2020-09-28 22:08:48 +03:00
Andrey Kleshchev 42fa322e76 Merged master (DRTVWR-497) into DRTVWR-514-keymappings 2020-09-28 21:21:13 +03:00
Dave Houlton 86e7cc3d35 Merge branch 'master' v6.4.9 into DRTVWR-497 2020-09-22 15:28:13 -06:00
Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
Andrey Kleshchev c2b55c4362 Merged master(DRTVWR-503) into DRTVWR-514-keymappings 2020-09-22 22:54:36 +03:00
Andrey Lihatskiy b8127f80c7 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
#	indra/llcommon/llkeybind.cpp
#	indra/llcommon/llkeybind.h
2020-06-24 00:08:35 +03:00
Andrey Kleshchev f8137f68a0 Reverted SL-6109 keybinding changes
Changes were moved to DRTVWR-514
2020-06-23 16:55:06 +03:00
andreykproductengine 3633ccf1a1 SL_6109 Rebinding 2020-06-23 14:48:02 +03:00
Andrey Kleshchev 92bdd1d13f SL-13265 "Empty leaf" crash safeguards 2020-05-18 18:33:08 +03:00
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
Andrey Lihatskiy b6441bf09b Merge branch 'DRTVWR-500' into DRTVWR-501-maint 2020-04-29 19:34:39 +03:00
Andrey Lihatskiy 7a311fe30e Merge branch 'master' into DRTVWR-497 2020-04-20 21:21:12 +03:00
Andrey Kleshchev 764cb89892 SL-12824 Imported fix for crash
For "Face with no texture index references indexed texture draw info"
2020-03-27 16:36:31 +02:00
andreykproductengine a4199b3e3c SL-12026, SL-1232 and SL-11614 2019-10-25 18:12:47 +03:00
andreykproductengine 4f5d785226 SL-12014 Animesh is now a separate rendering type 2019-10-25 17:32:19 +03:00
Graham Linden 5b1dd8a18c SL-11772
Modify behavior of culling while doing reflection/refraction passes.
2019-08-28 14:27:14 -07:00
andreykproductengine 5071951063 SL_6109 Rebinding 2019-08-19 23:16:29 +03:00
Graham Linden b865fc88e5 Fix broken distortion map rendering (was culling everything).
Clean up deferred\alpha shader to allow re-entrant graphics switching (link error on 2nd compile/link of deferred shaders).

Clean up some uses of pragma(optimize,...).
2019-01-08 17:20:56 -08:00
Brad Payne (Vir Linden) 47cb1a25fe SL-9849 - color tweaks for dynamic bounding box. show impostor extents varies line thickness depending on how recently impostor was generated 2018-10-10 20:39:02 +01:00
Brad Payne (Vir Linden) 0fd67838cf SL-966 - tweaks to scale/pos constraint logic 2018-10-03 10:29:11 +01:00
Brad Payne (Vir Linden) 5bb0b393a9 SL-966 - behavior improvements and visualization, bonus removal of unrelated duplicate code in llappviewer.cpp 2018-10-02 22:02:42 +01:00
Brad Payne (Vir Linden) 2a2046fd07 merge 2018-06-05 22:44:04 +01:00
Brad Payne (Vir Linden) 3f9b3e01b9 MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values. 2018-02-21 22:02:34 +00:00
Brad Payne (Vir Linden) e36745eb98 merge 2018-01-17 16:06:27 +00:00
Brad Payne (Vir Linden) 5c7f27562d merge 2017-11-29 23:40:12 +00:00
Nat Goodspeed e3a2c5e321 DRTVWR-418: Merge from latest viewer-release 2017-11-29 14:47:09 -05:00
Brad Payne (Vir Linden) 84b6bce4ee SL-704 - attachment surface area now computed in bulk rather than updated incrementally. Same dubious formula. 2017-11-17 14:26:34 +00:00
andreykproductengine 149b2d88dd MAINT-7228 Vertex buffer allocation failure handling 2017-11-01 19:36:13 +02:00
ruslantproductengine 325c076d09 MAINT-7213 Shared media (media as a texture) unusable with transparent mesh
New outline selection around mesh objects.
2017-10-26 18:33:08 +03:00
Oz Linden c20e57c48f move debugging globals to the "lowest" library they are referenced in 2016-12-20 14:41:46 -05:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
Oz Linden ca7631e4d7 MAINT-6183: Remove geometry bytes as a trigger for muted/impostor rendering 2016-03-01 16:01:21 -05:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Brad Payne (Vir Linden) 3612d7d14b merge 2016-01-15 16:42:39 -05:00
Brad Payne (Vir Linden) 94d7d6a623 SL-271 WIP, SL-201 WIP - add support for end point to joints, use for debug rendering display to show bones. 2015-11-17 16:41:55 -05:00
Oz Linden 9848fc4253 merge changes for 4.0.1-release 2016-01-15 17:01:16 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
AndreyL ProductEngine 67757ddd5b MAINT-5416 FIXED Cannot right-click a rigged mesh that's worn
--HG--
branch : maint-5416
2015-09-04 21:06:22 +03:00
Oz Linden 712a4e70c8 refine fix for MAINT-5560 based on review feedback and to fix VS objection 2015-08-26 12:07:16 -04:00
Oz Linden 206ef7a156 MAINT-5560: Correct imposter rendering flaws for avatars that have not had any attachments 2015-08-25 17:51:35 -04:00
AndreyL ProductEngine 57904b4def MAINT-5416 Reverted changeset: 9bd24c17d908 2015-07-23 23:59:05 +03:00