27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
a1349c14dd
SL-16413 Handle out of memory llface allocations
2021-11-25 00:00:29 +02:00
addec75adc
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-19 09:41:22 +01:00
bfcb1f61a8
SL-16263 RaiseException in LLVolumeFace::createSide
2021-10-28 01:27:18 +03:00
7bef9a1605
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-12 13:34:36 +02:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
fea2d7bacc
SL-16152 _Allocate failed
2021-10-08 01:32:48 +03:00
8e4907beee
SL-16014: Add Tracy markup for LLVolumeFace
2021-09-22 14:38:43 -07:00
8e725e74aa
DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces #2
2021-07-26 21:20:53 +03:00
a38e971f8d
Updates for non-allocating llsd changes (via Rye)
2021-06-13 12:37:29 +01:00
e5cbf1607a
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 22:19:54 +02:00
8a64ded50f
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 11:48:07 +03:00
a0bcb42352
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-04-30 14:11:34 +02:00
99a50b2bb5
Linux; FIRE-29492: completely disable cacheOptimize again.
2020-04-27 13:32:14 +02:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
797fa6718b
Merge 494-maint-wassail
2019-11-28 17:09:26 +01:00
bc496f5f17
Downstream merge from lindenlab/viewer-lynx
2019-11-27 22:58:52 +02:00
3d88b2587d
SL-12322 addTriangle crash
2019-11-21 17:49:03 +02:00
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
6fa34eff70
Merge Firestorm LGPL
2019-10-14 18:06:42 +02:00
84d7c832cb
Make indices 32 bit to avoid overflows.
2019-10-13 18:50:32 +02:00
f3855085f5
FIRE-23370 / Linux; cache optimize volume faces again without destroying the triangle mesh.
2019-10-12 06:59:39 +02:00
af5779a8fa
Merge Firestorm LGPL
2019-08-14 17:37:18 +02:00
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02:00
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
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
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
637a4f0956
Merge Firestorm LGPL
2019-04-03 20:39:01 +02:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
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
9735854226
Merge Firestorm LGPL
2018-11-16 18:10:32 +01:00
62e77ba1b2
Merge Firestorm LGPL
2018-11-15 21:24:16 +01:00
c21396181b
Merged in lindenlab/viewer-release
2018-11-14 22:47:31 +02:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
d2963a5e60
Merge viewer-cougar
2018-07-11 20:48:32 +02:00
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
c1f3b20f55
Merge axon
2018-06-20 19:07:46 +02:00
edf6795eda
SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output
2018-06-13 21:49:24 +01:00
430f9420cf
SL-915 - more on dynamic extent tracking, possible fix for 32-bit crash issues
2018-06-07 22:18:15 +01:00
5560f13b4b
Merge axon
2018-06-07 19:15:42 +02:00
2a2046fd07
merge
2018-06-05 22:44:04 +01:00
3fcf7a32ee
SL-915 - incremental updates to dynamic bounding box, setting to control detail.
2018-06-05 15:35:21 +01:00
acfe7e625e
Merge Firestorm LGPL
2018-06-01 22:10:21 +02:00
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +01:00
439273c9c1
Merge
2018-05-23 01:16:12 +01:00
d799bec7d8
Merge Firestorm LGPL
2018-05-18 14:46:58 +02:00
3f331bb24c
Merge Firestorm LGPL
2018-05-18 10:32:56 +02:00
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03:00
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
7a006ea3a2
merge
2018-05-18 18:40:36 +01:00
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
9f8c6ace4a
merge
2018-03-02 13:00:18 +00:00
c8e654c61d
Merge axon
2018-03-02 11:04:21 +01:00
9948fe9cc6
Merge Firestorm LGPL
2018-03-02 11:01:50 +01:00
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
3f9b3e01b9
MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values.
2018-02-21 22:02:34 +00:00
999163b3f5
Merge viewer-neko
2018-02-12 21:45:05 +01:00
ec33358c85
Merge viewer-bear
2018-02-12 21:33:11 +01:00
0d40ac2ed9
MAINT-8258 Don't show sculpty until it is loaded or load fails
2018-02-07 20:41:53 +02:00
3b4ae3fe52
MAINT-8269 Crahes in cacheOptimize()
2018-02-05 16:52:13 +02:00
bdc9a93bc9
MAINT-8269 Crahes in cacheOptimize()
2018-02-05 16:52:13 +02:00
89e753a81d
Merge Firestorm LGPL
2018-01-17 21:20:40 +01:00
e36745eb98
merge
2018-01-17 16:06:27 +00:00
0b6176dea9
Merge Firestorm LGPL
2018-01-25 21:57:38 +01:00
f727126c95
Merge viewer-bear
2018-01-25 21:55:38 +01:00
f6e3684f6e
Merge Firestorm LGPL
2018-01-17 12:07:54 +01:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
98569f84a2
Merge viewer-neko
2018-01-13 19:11:09 +01:00
c56298d4ba
MAINT-8022 Make unzip silent yet include failure reason into output
2018-01-03 16:30:57 +02:00
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
5c7f27562d
merge
2017-11-29 23:40:12 +00:00
d1f365d81d
Merge Firestorm LGPL
2017-11-29 23:43:03 +01:00
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
c606bc3492
Merge viewer-lynx
2017-11-12 12:28:28 +01:00
8821f554e5
Undo crash fix in LLProfile destructor for upcoming fix from LL
2017-11-07 11:23:54 +01:00
fec6bbddc3
MAINT-7974 Fixed LLProfile crash(error) caused by thread unsafe variable
2017-11-03 20:30:47 +02:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
13ea9a242a
Merge Firestorm LGPL
2017-10-11 20:30:12 +02:00
06db7c626f
Merge Firestorm LGPL
2017-10-11 17:58:16 +02:00
299592e88e
merge
2017-10-11 14:16:39 +01:00
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02:00
615336a4d4
Merge viewer-neko
2017-09-07 21:49:12 +02:00
a571707243
SL-731 - render metadata includes triangle count, triangle and vertex count included with debug text for control avatar
2017-08-03 14:23:02 +01:00
58cea615c5
MAINT-7649 Error with information in case of failed allocation.
2017-09-01 17:06:25 +03:00
03e7dc1a6f
Merge with fs-lgpl.
2017-04-04 16:25:22 +02:00
e19d7a7490
Merge with viewer64.
2017-02-14 19:49:51 +01:00
e8d4094d90
Merge viewer-bear
2017-02-03 20:09:53 +01:00
6770c27321
MAINT-6645 - Improvement - Agents that render as jelly dolls should have their attachments render at 0 LoD to prevent loading higher LoD complexity in memory thus deterring crashes.
...
Comments:
- Fix based on "RenderAutoMuteByteLimit" setting.
- File indra/llxml/llcontrol.h - add all signals to 0 group.
It garanty that handlers (in indra/newview/llviewercontrol.cpp) will be called last.
2017-01-24 15:56:25 +02:00
ce2cbdc4b5
MAINT-309 Fixed top and bottom cube faces do not show a selection silhouette
2017-01-25 21:59:47 +02:00
c20e57c48f
move debugging globals to the "lowest" library they are referenced in
2016-12-20 14:41:46 -05:00
eb06fba767
Merge bento-box
2016-11-30 21:03:16 +01:00
93db7eacbd
SL-540 - fix for regression in handling of out-of-range joint indices in skin weights
2016-11-30 14:03:54 -05:00
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
1771857e6c
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-03-06 14:27:29 -05:00
Andrey Kleshchev