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

220 Commits (9300613edcfbc82c06d5a9a0add472db10d7c8b6)

Author SHA1 Message Date
Ansariel 9300613edc Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-06-29 21:57:31 +02:00
Ansariel fc11575657 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 20:28:29 +02:00
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03:00
Ansariel bd414ee0d0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-06-29 17:21:22 +02:00
Beq 16b63a990e Allow user to configure LOD suffixes to suit their workflow. 2022-06-05 22:26:52 +01: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
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
 2022-05-28 23:00:17 +02:00
Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	autobuild.xml
#	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 11:41:45 +02: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
Ansariel 4446933c54 Build fix 2022-03-01 20:33:53 +01:00
Ansariel 63238d1fbe Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 19:19:48 +01: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
Ansariel a0837a5298 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-14 13:46:29 +01:00
Ansariel d881fa40d3 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-20 22:35:31 +01:00
Dave Parks 28f9fb06a9 SL-16289 Rigged mesh rendering overhaul 2021-11-20 18:49:19 +00:00
Ansariel 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
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
Beq 99027205df FIRE-30965 Improve mesh upload error + rewrite subset checks 
Rewrite material parsing to properly implement material subset with the NoGeometry tag.
 2021-05-28 03:07:14 +01:00
Andrey Kleshchev 7235799a02 SL-15183 Crash at LLModel::matchMaterialOrder 2021-04-29 09:00:57 +02:00
Andrey Kleshchev 250212d614 SL-15183 Crash at LLModel::matchMaterialOrder 2021-04-29 00:11:25 +03:00
Andrey Kleshchev aba9a73193 SL-14993 Crash accessing mInvBindMatrix 2021-03-23 08:50:43 +01:00
Andrey Kleshchev 9fc1b51ae8 SL-14993 Crash accessing mInvBindMatrix 2021-03-23 01:08:38 +02:00
Nicky Dasmijn f116ea4cb7 Merge remote-tracking branch 'fs/master' into fs-vs2017-d476 
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
 2020-07-20 09:58:30 +02:00
Beq e5ba5b7479 make mesh normals great again hack is now optional 2020-06-24 17:31:01 +01:00
Beq 0e623cc3b4 BUG-228952 - fix vertex normal scaling bug 2020-06-20 00:57:48 +01:00
Anchor 32f1dfa531 [DRTVWR-476] - fix compiler errors 32 bit windows build 2020-03-25 18:44:04 -04:00
Nicky 6ca7831872 Merge with viewer-vs2017 2019-06-27 10:14:49 +02:00
Anchor 2c2bdcf348 [DRTVWR-476] - fix compiler errors 32 bit windows build 2019-06-10 15:56:44 -07:00
Ansariel 457d9792c0 Merge axon 2018-07-15 12:32:06 +02:00
Brad Payne (Vir Linden) 73c76fdccf MAINT-8863 - more diagnostics and possible fix 2018-07-13 18:56:08 +01:00
Ansariel c1f3b20f55 Merge axon 2018-06-20 19:07:46 +02: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
Ansariel a2879b80a6 Merge Firestorm LGPL 2018-05-08 17:13:44 +02:00
Nicky 8a81a43161 Merge. 2018-04-10 11:42:59 +02:00
Nicky 4e598848f6 Out of bounds read: lod is not supposed to be bigger than MODEL_LODS-1 as there is only LOD values from [0,4]. 2018-04-03 13:35:19 +02:00
Brad Payne (Vir Linden) 9f8c6ace4a merge 2018-03-02 13:00:18 +00:00
Ansariel c8e654c61d Merge axon 2018-03-02 11:04:21 +01: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
Ansariel 0b6176dea9 Merge Firestorm LGPL 2018-01-25 21:57:38 +01:00
Ansariel f727126c95 Merge viewer-bear 2018-01-25 21:55:38 +01:00
maxim_productengine 3e380c9a84 MAINT-8208 [Mac] Viewer crashes when uploading certain mesh model after enabling "Include skin weight" 2018-01-22 18:11:12 +02:00
Ansariel 7373226432 Back out old fix for FIRE-9251 that doesn't seem to work and make room for new fix from LL 2018-01-23 17:01:48 +01:00
andreykproductengine c56298d4ba MAINT-8022 Make unzip silent yet include failure reason into output 2018-01-03 16:30:57 +02:00