a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +03:00
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
ca24fc11ea
SL-17375 Crash at LLViewerOctreeEntry::getSpatialExtents()
...
access violation, 'this' was null
2022-05-06 20:55:41 +03:00
bafa869c21
SL-17239 Override face bounding box with avatar bounding box for rigged meshes when calculating virtual size.
2022-04-25 15:58:07 -05:00
f8d5fc6a1f
Merge remote-tracking branch 'origin/sl-17218' into DRTVWR-543-maint
2022-04-14 23:46:28 +03:00
b9ed5f9e79
SL-17218: Per NickyD review feedback, test LLFace::mNormals too.
2022-04-14 15:48:09 -04:00
557fb2cccd
SL-17218: Update faulty test for null LLFace::mTangents
2022-04-14 15:29:05 -04:00
e5cd4da823
SL-17035 Crash at gl_debug_callback
...
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
2022-04-14 22:26:58 +03:00
bc7dc2f949
SL-17160 Ignore "getIsAlphaMask" on rigged faces.
2022-04-06 12:57:07 -05:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
917e3caec6
SL-16606: Add profiler category FACE
2022-01-14 11:50:19 -08:00
8b92652806
SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush()
2021-11-30 17:04:35 -07:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
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
dd3fc66b51
SL-16014: Add Tracy markup to LLFace
2021-09-22 14:38:43 -07:00
a35544c701
SL-16027: Add Tracy OpenGL support
2021-09-21 16:10:52 -07:00
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
7199ce4514
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
...
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit 5691d302ef
2021-05-26 10:57:39 -06:00
58b4afa0ba
Merge branch 'master' into DRTVWR-530-maint
2021-04-30 03:05:06 +03:00
e2b08317e8
SL-15188 Crash at SecondLifeViewer!LLUUID::isNull(1007)
...
Crash at getNormalID().isNull()
2021-04-29 13:35:28 +03:00
5691d302ef
SL-12069 Issues with bakes-on-mesh and alpha modes
2020-12-10 23:17:07 +02:00
86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06:00
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
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
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
33633361a3
Revert SL-11848 in scope of SL-12824
...
This reverts commit 8a9a929599
2020-03-27 16:11:22 +02:00
3d22273726
Fix for bad fullbright shiny shininess values and inconsistency between materialF and fullbrightShinyF
2020-03-24 11:22:01 -05:00
edb4373f7d
SL-9775 FIXED EEP viewer crash when looking at the sun (which is playing parcel media)
2020-03-05 14:13:39 +02:00
4be51fa559
DRTVWR-440: SL-12574: Tweak environment cube map to better match Windlight
2020-02-07 16:17:15 -08:00
fa39ff67f0
Merge branch 'master' into DRTVWR-497
2020-02-06 21:31:34 +02:00
0e7ab122ec
SL-10908 LLFace should fully rely onto drawable
2020-02-04 13:12:38 +00:00
2a6b48c9b0
DRTVWR-440, merge in latest from 6.3.7 release
2020-01-28 17:26:45 -07:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
5f731d84cb
Downstream merge from 494-maint-wassail
2019-11-12 02:37:15 +02:00
4dd3d230ec
Merged in lindenlab/viewer-release
2019-11-14 23:44:45 +02:00
4f5d785226
SL-12014 Animesh is now a separate rendering type
2019-10-25 17:32:19 +03:00
8a9a929599
SL-11848 Fixed login crash (Face with no texture index references indexed texture draw info)
2019-09-05 23:46:59 +03:00
be7713cab2
Merged in lindenlab/viewer-release
2019-08-14 15:02:56 +03:00
7a64e8f8bf
Merge viewer-release 6.2.5
2019-08-13 15:24:38 -07:00
47cbcb61f8
DRTVWR-493 Cleaned up unneded inits.
2019-07-04 20:24:38 +03:00
f3f75acb23
SL-10952 - Look at performance impact of selection outline changes
...
SL-10973 - [Love Me Render] Mesh Child Prims in Linkset are now Yellow instead of Blue -
Fixed
2019-04-22 16:32:15 +03:00
1d994e7702
SL-5570 - Align planar faces" does not work on normal or specular maps
...
SL-10864 -Normal and Specular textures can be rotated with checked align planar faces checkbox
Implement separate texture layers alignment.
2019-04-04 19:18:50 +03:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
4c0f6f5825
SL-10194 Selecting mesh face doesn't highlight the face in any way
...
- Fixed according to Steeltoe notes.
- Add const modifier for some methods
2019-01-25 18:26:42 +02:00
12cd42221e
SL-10416
...
Replace hope and asserts with checks in LLFace::setTexture in hopes of side-stepping media texture crash.
2019-01-30 08:54:29 -08:00
2e55e529d4
SL-10194 Selecting mesh face doesn't highlight the face in any way
...
- Implemented
2019-01-08 18:26:34 +02:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
f07dc421e8
Merge
2018-06-21 09:13:19 -07:00
9d7b353cbb
merge
2018-06-21 15:49:53 +01:00
Andrey Lihatskiy