summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# 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-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# 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-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-02-12SL-4488 Fixed ambiguity mapped weights to vertices in uploaderAndrey Kleshchev
Were not displaying and uploading correctly.
2022-02-11SL-1370 Add more memory logging to mesh repositoryAndrey Kleshchev
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-20SL-16289 Rigged mesh rendering overhaulDave Parks
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-11-15SL-15756 Removed mHasGeneratedFacesAndrey Kleshchev
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-10-14SL-16131 Fix for alignment warnings on Win32 builds.Dave Parks
2021-09-20SL-16006 and SL-16009 Rigged mesh rendering optimization passDave Parks
2021-09-09SL-15965 Support wider range of parsing errorsAndrey Kleshchev
2021-09-08SL-14541 Replace zlib with zlib-ngAndrey Kleshchev
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-08-04DRTVWR-542 Automated method selectionAndrey Kleshchev
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
2021-08-04DRTVWR-542 Fix incorect dropbox stateAndrey Kleshchev
2021-07-28DRTVWR-542 Fix malfunctioning warningAndrey Kleshchev
2021-06-07Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-05-26SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha ↵Dave Houlton
masks. Revert "SL-12069 Issues with bakes-on-mesh and alpha modes" This reverts commit 5691d302ef876a7e6fb6861441f14e5e7f0c7735.
2021-04-30Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-04-30Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-29SL-15183 Crash at LLModel::matchMaterialOrderAndrey Kleshchev
2021-04-13SL-15102 Crash at load_face_from_dom_trianglesAndrey Kleshchev
2021-04-06SL-14960 Add checkbox to turn off collision sound.Mnikolenko Productengine
2021-04-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/lltoolpie.cpp
2021-04-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-23SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-03-23SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-02-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2021-01-11SL-2202 Add exception handling around boost::regex_match() calls in the viewerMnikolenko Productengine
2020-12-10SL-12069 Issues with bakes-on-mesh and alpha modesAndrey Kleshchev
2020-12-09Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"Andrey Kleshchev
This reverts commit afd734b5f4ba66204f80f7726aa5fec538fcf1e4. Fix will be updated and moved to DRTVWR-515.
2020-11-23SL-13599 Resolve gcc v10 'no trivial copy-assigment' warningsAndrey Kleshchev
2020-11-09SL-13599 Fixed missing zeroAndrey Kleshchev
2020-10-28SL-13599 Variable should correspond to typeAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 09:54:56 +0000