livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,939 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

161 Commits (87664fa35de33a8db00dd61ba91f5dc73afce14a)

Author SHA1 Message Date
Andrey Lihatskiy e0ace0c722 Merge branch 'master' into DRTVWR-570-maint-Q 
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
 2022-10-20 22:34:11 +03:00
Rye Mutt e83146ce0c Optimize away constant map finds in getSkinInfo by caching mesh skin into in vovolume 2022-09-27 17:59:21 -04:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:44:04 +03:00
Andrey Lihatskiy 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
Andrey Lihatskiy 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
Cosmic Linden 4ef83bb8bd SL-17801: Add various safeguards to keep triangle indices count valid 2022-07-21 15:19:00 -07:00
Andrey Lihatskiy 2e837e5389 Merge branch 'master' into DRTVWR-548-maint-N 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llviewercontrol.cpp
 2022-06-29 20:51:08 +03:00
Andrey Lihatskiy a7c9ca8960 Merge branch 'master' into DRTVWR-561-maint-O 2022-06-29 20:32:13 +03:00
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03:00
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Andrey Kleshchev b08340f183 SL-17475 Remap models before simplification 2022-06-11 10:23:46 +03:00
Andrey Lihatskiy 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
Andrey Lihatskiy 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
Andrey Kleshchev 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
Andrey Lihatskiy 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
Andrey Lihatskiy 201f83472c Merge branch 'master' into DRTVWR-543-maint 2022-02-28 21:55:28 +02:00
Andrey Kleshchev 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
Andrey Kleshchev 6f49893fb3 SL-1370 Add more memory logging to mesh repository 2022-02-11 15:25:04 +02:00
Dave Parks 28f9fb06a9 SL-16289 Rigged mesh rendering overhaul 2021-11-20 18:49:19 +00:00
Dave Parks f79890669d SL-16006 and SL-16009 Rigged mesh rendering optimization pass 2021-09-20 18:58:09 +00:00
Andrey Kleshchev 5af8f15a05 SL-14541 Replace zlib with zlib-ng 2021-09-08 23:18:07 +03:00
Andrey Kleshchev 250212d614 SL-15183 Crash at LLModel::matchMaterialOrder 2021-04-29 00:11:25 +03:00
Andrey Kleshchev 9fc1b51ae8 SL-14993 Crash accessing mInvBindMatrix 2021-03-23 01:08:38 +02:00
Anchor 32f1dfa531 [DRTVWR-476] - fix compiler errors 32 bit windows build 2020-03-25 18:44:04 -04:00
Brad Payne (Vir Linden) 73c76fdccf MAINT-8863 - more diagnostics and possible fix 2018-07-13 18:56:08 +01:00
Brad Payne (Vir Linden) edf6795eda SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output 2018-06-13 21:49:24 +01:00
Brad Payne (Vir Linden) 6862190500 SL-915 - face-level caching, bug fix 2018-06-08 19:56:34 +01:00
Brad Payne (Vir Linden) 9f8c6ace4a merge 2018-03-02 13:00:18 +00:00
Brad Payne (Vir Linden) 3f9b3e01b9 MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values. 2018-02-21 22:02:34 +00:00
maxim_productengine 750d90cf59 MAINT-8208 [Mac] Viewer crashes when uploading certain mesh model after enabling "Include skin weight" 2018-01-22 18:11:12 +02:00
andreykproductengine c56298d4ba MAINT-8022 Make unzip silent yet include failure reason into output 2018-01-03 16:30:57 +02:00
andreykproductengine 4fc012fbfa Reverted changeset 409b67af8faf (MAINT-6901) 2016-12-23 15:16:50 +02:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release 
DRTVWR-412 Bento (avatar skeleton extensions)
 2016-12-05 21:51:29 +02:00
andreykproductengine 416a46711d MAINT-6901 safety checks fix 2016-11-21 22:58:07 +02:00
andreykproductengine 75eb1e6ca6 MAINT-6901 Linux build fix 2016-11-18 16:24:36 +02:00
andreykproductengine 4ae6f32ee1 MAINT-6901 Fixes upload assigning different scale to parts of the model 2016-11-15 20:16:01 +02:00
Brad Payne (Vir Linden) 5dcd81c155 SL-451 - avoid more high-cost string operations in a per-frame function 2016-10-28 09:33:57 -04:00
Brad Payne (Vir Linden) 45ab1429b2 SL-395 - believed fix for intermittent problem uploading meshes with scale locks 2016-10-19 11:05:02 -04:00
Brad Payne (Vir Linden) e6297ab3d6 SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette() 2016-09-27 17:29:22 -04:00
Brad Payne (Vir Linden) 6c46b3caf2 SL-395 - can enable/disable scale lock in mesh upload UI. Feature works. 2016-09-06 16:32:41 -04:00
Brad Payne (Vir Linden) 34ced1aa2c SL-395 - partial support for joint scale locking via flag in skin info 2016-09-02 16:44:57 -04:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Brad Payne (Vir Linden) b138ca8aee SL-366 - more cases where skinned weights can go awry, and a bunch more asserts to verify. 2016-04-06 16:12:39 -04:00
Brad Payne (Vir Linden) 7b410df303 SL-124 WIP - cleanup of comments and test code before going to project viewer. 2015-11-25 15:07:26 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden) fc74e02cde merge 2015-09-30 11:00:48 -04:00
Brad Payne (Vir Linden) 2ea8df0593 SL-205 WIP - support for 152-joint rigged meshes with both hardware and software skinning. 2015-08-26 10:49:02 -04:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
andreykproductengine 1dd7e76908 Merge with viewer-release and become 3.7.28 2015-04-14 18:53:17 +03:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00