Commit Graph

429 Commits (7bef9a16052d4facaf748a6f3a783b63915281e4)

Author SHA1 Message Date
Ansariel 7bef9a1605 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-10-12 13:34:36 +02:00
Andrey Kleshchev fea2d7bacc SL-16152 _Allocate failed 2021-10-08 01:32:48 +03:00
Beq a38e971f8d Updates for non-allocating llsd changes (via Rye) 2021-06-13 12:37:29 +01:00
Andrey Kleshchev e5cbf1607a SL-14119 Crash at LLVolumeFace::cacheOptimize 2020-10-14 22:19:54 +02:00
Andrey Kleshchev 8a64ded50f SL-14119 Crash at LLVolumeFace::cacheOptimize 2020-10-14 11:48:07 +03:00
Ansariel a0bcb42352 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-04-30 14:11:34 +02:00
Nicky 99a50b2bb5 Linux; FIRE-29492: completely disable cacheOptimize again. 2020-04-27 13:32:14 +02:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500
# Conflicts:
#	indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
Dave Houlton f61a5c4642 Merge viewer-release 6.3.6 into viewwer-eep repo 2019-12-16 12:47:19 -07:00
Ansariel da365b227e Merge Firestorm LGPL 2019-12-13 18:15:19 +01:00
Ansariel 797fa6718b Merge 494-maint-wassail 2019-11-28 17:09:26 +01:00
AndreyL ProductEngine bc496f5f17 Downstream merge from lindenlab/viewer-lynx 2019-11-27 22:58:52 +02:00
andreykproductengine 3d88b2587d SL-12322 addTriangle crash 2019-11-21 17:49:03 +02:00
Ansariel 6e340961c0 Merge viewer-neko 2019-10-30 18:05:01 +01:00
andreykproductengine 1b4d5492c6 SL-11727 Fix build warnings 2019-10-23 16:37:15 +03:00
Ansariel 6fa34eff70 Merge Firestorm LGPL 2019-10-14 18:06:42 +02:00
Nicky 84d7c832cb Make indices 32 bit to avoid overflows. 2019-10-13 18:50:32 +02:00
Nicky f3855085f5 FIRE-23370 / Linux; cache optimize volume faces again without destroying the triangle mesh. 2019-10-12 06:59:39 +02:00
Ansariel af5779a8fa Merge Firestorm LGPL 2019-08-14 17:37:18 +02:00
Ansariel 61c56570ab Merge viewer-eep 2019-08-13 19:05:23 +02:00
Graham Linden 71af0a2a9e Fix shutdown crash in teardown of joint heirarchy.
Ifdef'd code for potential skinning speed up to avoid lots of int<->float conversions (expensive and static for min space investment)
as updating rigged VBs shows up as a profiling bottleneck for Low rendering (where we actually use CPU skinning).
2019-08-06 14:41:55 -07:00
Graham Linden 76128c4357 SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
Nicky d9888f07f3 FIRE-23370/BUG-8801/MAIN-5060/Linux; (For now) disable LLVolumeFace::cacheOptimize as it can destroy the triangle definition of a meshes. 2019-07-23 16:20:34 +02:00
Ansariel 637a4f0956 Merge Firestorm LGPL 2019-04-03 20:39:01 +02:00
Graham Linden d78ed764b5 Merge 6.1.2 LoveMeRender new hotness 2019-04-02 12:27:34 -07:00
Ansariel 7fdc689a85 Merge viewer-eep 2019-03-21 20:54:50 +01:00
Graham Linden 898c9f4421 Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR. 2019-03-13 13:21:48 -07:00
Ansariel 9735854226 Merge Firestorm LGPL 2018-11-16 18:10:32 +01:00
Ansariel 62e77ba1b2 Merge Firestorm LGPL 2018-11-15 21:24:16 +01:00
AndreyL ProductEngine c21396181b Merged in lindenlab/viewer-release 2018-11-14 22:47:31 +02:00
Rider Linden 1d022e86c8 Merge 2018-11-14 11:19:33 -08:00
Ansariel 1733550573 Merge viewer-eep 2018-09-22 00:42:04 +02:00
Ansariel d2963a5e60 Merge viewer-cougar 2018-07-11 20:48:32 +02:00
Graham Linden 0aa2e5b1a3 Replace cache hit info in tex fetch debug display.
Silence launcher warning for devs.

Work-around path gen deciding to gen NaNs for some flexi prims.
2018-06-28 19:30:19 +01:00
Ansariel c1f3b20f55 Merge axon 2018-06-20 19:07:46 +02:00
Brad Payne (Vir Linden) edf6795eda SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output 2018-06-13 21:49:24 +01:00
Brad Payne (Vir Linden) 430f9420cf SL-915 - more on dynamic extent tracking, possible fix for 32-bit crash issues 2018-06-07 22:18:15 +01:00
Ansariel 5560f13b4b Merge axon 2018-06-07 19:15:42 +02:00
Brad Payne (Vir Linden) 2a2046fd07 merge 2018-06-05 22:44:04 +01:00
Brad Payne (Vir Linden) 3fcf7a32ee SL-915 - incremental updates to dynamic bounding box, setting to control detail. 2018-06-05 15:35:21 +01:00
Ansariel acfe7e625e Merge Firestorm LGPL 2018-06-01 22:10:21 +02:00
Graham Linden 37e8fd20c3 Merge to 5.1.6 2018-06-01 15:34:21 +01:00
Graham Linden graham@lindenlab.com 439273c9c1 Merge 2018-05-23 01:16:12 +01:00
Ansariel d799bec7d8 Merge Firestorm LGPL 2018-05-18 14:46:58 +02:00
Ansariel 3f331bb24c Merge Firestorm LGPL 2018-05-18 10:32:56 +02:00
AndreyL ProductEngine 64b3473f49 Merged in lindenlab/viewer-release 2018-05-18 03:02:44 +03:00
Graham Linden graham@lindenlab.com 0d7fa932d5 Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch).

Put in nSight debug support.
2018-04-20 18:14:29 +01:00
Brad Payne (Vir Linden) 7a006ea3a2 merge 2018-05-18 18:40:36 +01:00
Ansariel 5d924483a8 Merge viewer-cougar 2018-03-02 15:00:48 +01:00
Brad Payne (Vir Linden) 9f8c6ace4a merge 2018-03-02 13:00:18 +00:00