d5501d459b
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
2022-07-01 11:36:10 +02:00
b08340f183
SL-17475 Remap models before simplification
2022-06-11 10:23:46 +03:00
16b63a990e
Allow user to configure LOD suffixes to suit their workflow.
2022-06-05 22:26:52 +01:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# 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-02 10:12:19 +01: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
ea9aa51dfe
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2021-11-30 08:43:46 +01:00
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +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
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
ca629c362c
SL-15965 Support wider range of parsing errors
2021-09-09 21:17:00 +03:00
1a17932440
DRTVWR-542 Automated method selection
...
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
2021-08-04 21:14:00 +03:00
7235d333ea
DRTVWR-542 Fix incorect dropbox state
2021-08-04 00:15:49 +03:00
2d2ed85c56
DRTVWR-542 Fix malfunctioning warning
2021-07-28 22:19:43 +03:00
c5246338bf
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-02 14:32:36 +02:00
d0ac1505a7
SL-15102 Crash at load_face_from_dom_triangles
2021-04-13 00:40:00 +03:00
b834664d81
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 11:31:36 +02:00
14bf268fbb
Merge branch 'master' into DRTVWR-513-maint
2020-10-14 21:59:52 +03:00
f323e34b07
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-09-23 06:53:16 +02:00
bdedfb3755
SL-13566 'Use Joint Positions' Option causes collapsed Joints for some files
2020-08-28 21:01:48 +03:00
c5af669e3b
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-08-12 12:24:35 +02:00
3239f3518b
SL-13698 Mac build fix
2020-08-11 20:43:50 +03:00
7a9a114e16
SL-13698 FIXED crash on model upload
2020-08-03 19:14:09 +03:00
187b1e0d6e
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llpanelpermissions.cpp
# indra/newview/llviewerregion.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_attachment_self.xml
# indra/newview/skins/default/xui/en/menu_avatar_self.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
2020-07-09 10:08:42 +02:00
da0024efec
SL-13426 Fixed crash at processDomModel
2020-07-06 16:48:59 +03:00
92e7843fcf
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/lltabcontainer.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmodelpreview.cpp
2020-04-25 17:26:59 +02:00
9221c8a3f6
SL-13080 Changes for joint listings in mesh uploader
2020-04-23 20:51:06 +03:00
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02: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
d30bb9b7c4
Merge Firestorm LGPL
2018-04-07 14:10:32 +02:00
6888ade517
Linux: Create a safe and happy place for GCC when including glh_linear.h
2018-03-26 20:05:34 +02:00
c8e654c61d
Merge axon
2018-03-02 11:04:21 +01: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
c606bc3492
Merge viewer-lynx
2017-11-12 12:28:28 +01:00
2f981013aa
Undo DAE file loader fix to make room for fix from LL
2017-11-01 14:35:53 +01:00
c8c8005e2f
MAINT-2161 Fixed dae parsing issue - dae expects escaped names
2017-10-31 16:41:39 +02:00
95fcf065c1
Merge viewer-bear
2017-04-19 21:43:58 +02:00
5ddac01ef2
MAINT-7058 Fixed missing extents for generated (split) faces
2017-04-14 17:13:57 +03:00
4fc012fbfa
Reverted changeset 409b67af8faf (MAINT-6901)
2016-12-23 15:16:50 +02:00
47d6879578
Reverted changeset 409b67af8faf (MAINT-6901)
2016-12-23 15:16:50 +02:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
5351c445a8
Merge Firestorm LGPL
2016-11-29 19:26:31 +01:00
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
4ae6f32ee1
MAINT-6901 Fixes upload assigning different scale to parts of the model
2016-11-15 20:16:01 +02:00
42c77ab5bc
Merge Firestorm LGPL
2016-11-04 12:52:13 +01:00
6f1c696c2a
Merge bento-box
2016-10-26 19:45:02 +02:00
40c06f4836
Merge Firestorm LGPL
2016-10-22 20:30:54 +02:00
a2fd408c9b
MAINT-6853 - fix for viewer crash when checking preview skin weights
2016-10-21 09:50:13 -04:00
Ansariel