329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
59ab8e78f4
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
ea26ee5e92
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
2cf9f046a6
SL-17545 lodQueryCallback should quit as soon as it is done
2022-07-07 20:50:56 +03:00
3dcdc4c85a
SL-17545 fix double-scheduling of calculations
2022-07-06 15:57:58 +03:00
429274c468
SL-17545 Recalculate lods when replacing high lod with something incompatible
2022-07-04 21:40:31 +03:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03:00
b1cbf369cf
SL-17475 Use a shadow indices buffer before simplification
2022-06-14 21:41:27 +03:00
45bcefd981
SL-17475 fix remap causing an assert
2022-06-14 16:40:56 +03:00
b08340f183
SL-17475 Remap models before simplification
2022-06-11 10:23:46 +03:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
87e7b732ba
SL-98-a - fix jumping ground plane
2022-05-16 11:39:04 -07:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
026ad511ea
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
16494f4400
Merge branch 'master' into DRTVWR-548-maint-N
2022-04-18 20:38:56 +03:00
84e22d410e
SL-17121 Fix error threshold value
2022-04-01 22:32:57 +03:00
14e792766e
SL-17121 Adjust uploader for possible 0 input.
2022-04-01 01:39:35 +03:00
7f0e62ea9e
SL-17121 Revert "SL-15940 Remove ability to set zero triangle limit"
...
This reverts commit b45c0e3ed9
2022-04-01 00:53:52 +03:00
bcd37186f1
SL-16993: Fix Model Upload Physics Analyze rendering physics hull as black mesh
2022-03-18 19:54:27 -07:00
c58c308d21
SL-17002 FIXED The "include joint positions" checkbox is displayed inactive
2022-03-15 16:13:24 +02:00
0b56a3da94
SL-16980 FIXED Uploading model preview disappeared after changing the Triangle limit
2022-03-09 23:53:20 +02:00
5e89e26554
SL-16980 FIXED Uploading model preview disappeared after changing the Triangle limit
2022-03-09 17:32:22 +02:00
c012e872a2
SL-3787 Fallback in case meshopt precise simplification methd fails entirely
2022-03-07 17:03:23 +02:00
340213b302
SL-9748 - Only supply a default physics shape if it is named default_physics_shape
2022-03-03 18:56:52 -08:00
239a29ab5c
SL-9748 - more cases
2022-03-02 17:39:12 -08: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
130d0c0704
Merge branch 'master' of bitbucket.org:lindenlab/viewer into SL-9749
2022-02-28 15:54:23 -08:00
932b7de530
SL-9748 - Handle submesh case of resuseable physics model.
2022-02-28 15:47:56 -08:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
9210ec8a82
SL-9748 - Apply explicitly given physics shape only if the usual rules do not.
2022-02-25 18:32:55 -08:00
92c302d6fb
SL-15940 Verify triangle limit
...
to not trigger an assert inside meshoptimizer
2022-02-25 18:56:54 +02:00
c141ecdcc2
SL-3787 Fixed sloppy mode returning invalid model
...
In automatic mode for simple models gradualy increase sloppy decimator until something valid is found.
2022-02-25 13:51:19 +02:00
21baea0907
SL-3787 Fixed mesh uploader LoD generation returning worse results than higher lod
2022-02-24 14:42:04 +02:00
a5f06a1b81
SL-4488 Fixed ambiguity mapped weights to vertices in uploader
...
Were not displaying and uploading correctly.
2022-02-12 23:13:36 +02:00
ca43cc2305
SL-98 - Remove special new tab-specific display behavior
2022-02-04 14:13:19 -08:00
f1df486208
SL-98 - move new renderGroundPlane from LLVOAvatar to LLModelPreview
2022-02-04 13:55:08 -08:00
57a7f63dcc
SL-98 - Render a "ground plane" in the model upload preview, so users can see any added offset
2022-02-04 09:55:05 -08:00
2d0d7c71e6
SL-16485 Crash at memcpyNonAliased16
2021-12-15 14:40:44 +02:00
0a9ade4687
SL-16479 'sloppy' precision in automated mode.
2021-12-09 21:17:57 +02:00
9e38e5a187
SL-16471 Removed unneeded MeshOpt generation method
2021-12-09 00:33:57 +02:00
2ed229473d
SL-14403 Remove unused shader binds
...
remains from glod
2021-12-02 17:35:03 +02:00
1cd1d3fbe2
SL-16420 Upload's physics LODs are broken in preview #2
2021-12-02 02:28:29 +02:00
06c94c83fe
SL-16420 Upload's physics LODs are broken in preview
2021-12-01 22:13:17 +02:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
cba1daaf6b
SL-16226 Fix crash with extra large faces
2021-11-17 22:03:38 +02:00
3641541c6c
SL-15756 Removed mHasGeneratedFaces
...
mHasGeneratedFaces is always true for some types of models and glod was treating faces as one mesh by default, so meshoptimizer should do the same regardles of mHasGeneratedFaces
2021-11-15 23:23:09 +02:00
33f52ee51d
SL-14403 Removed glod
2021-11-10 17:48:55 +02:00
Andrey Lihatskiy