8b0d341aca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 12:34:53 +02:00
2aceea66ff
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/newview/llfloateropenobject.cpp
# indra/newview/llfloateropenobject.h
# indra/newview/llmaterialmgr.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/skins/default/xui/en/floater_openobject.xml
2022-10-01 13:10:39 +02:00
1b31ab5c52
Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces
2022-09-27 17:59:21 -04:00
49b6f9b312
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 14:52:20 +02:00
1e50da6b7a
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-07-27 02:06:54 +02:00
cdff716908
SL-17801: Don't let external code delete the raw pointer to the picking octree
2022-07-26 10:40:19 -07:00
f1128da8da
SL-17801: Use raw array for mOctreeTriangles to avoid memory alignment issues, increasing risk of crashes during picking due to SIMD operations
2022-07-26 10:40:19 -07:00
d5501d459b
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
2022-07-01 11:36:10 +02:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
162280cd98
SL-17021: Templatize LLOctreeNode and related classes to allow for option to store elements in octrees as raw pointers. Use for faster allocation in LLVolumeFace::createOctree.
2022-06-21 12:33:32 -07:00
b08340f183
SL-17475 Remap models before simplification
2022-06-11 10:23:46 +03:00
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
2d2ed85c56
DRTVWR-542 Fix malfunctioning warning
2021-07-28 22:19:43 +03:00
a38e971f8d
Updates for non-allocating llsd changes (via Rye)
2021-06-13 12:37:29 +01: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
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
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
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02: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
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +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
fec6bbddc3
MAINT-7974 Fixed LLProfile crash(error) caused by thread unsafe variable
2017-11-03 20:30:47 +02:00
e19d7a7490
Merge with viewer64.
2017-02-14 19:49:51 +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
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
a0c253bb78
Merge bento-box
2016-10-19 00:16:24 +02:00
8230a9937f
MAINT-6841 - removed the joint remapping code, since it was designed to support a feature we no longer have. This also incidentally fixes any bugs caused by the joint remapping code.
2016-10-18 16:05:35 -04:00
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
be6ce75a96
Merge bento-box
2015-12-17 11:47:42 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
6c6a95478e
SL-234 WIP - remap skin weights to match included-joint logic
2015-10-19 16:32:49 -04:00
2be388c7e0
Merge Firestorm LGPL
2015-09-30 10:41:43 +02:00
Ansariel