summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Collapse)Author
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-06-11SL-17475 Remap models before simplificationAndrey Kleshchev
2022-06-08SL-17214 initial loader class skeletonDave Houlton
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-20SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots ↵Dave Parks
doing a full resolution render instead of a 512x512 render.
2022-04-05SL-17147 Disable simplification UI after calculating feeMnikolenko Productengine
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-01-12SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-09SL-16471 Removed unneeded MeshOpt generation methodAndrey Kleshchev
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-09-20SL-16006 and SL-16009 Rigged mesh rendering optimization passDave Parks
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-23DRTVWR-542 Attempt to simplify all faces of an object as a whole and split ↵Andrey Kleshchev
back into faces
2021-07-12DRTVWR-542 WIP #6Andrey Kleshchev
Trying out 'sloppy' variant
2021-07-11DRTVWR-542 WIP #4Andrey Kleshchev
Made meshoptimizer into default generation mechanism Ensured that at least one triangle will remain of any face
2021-07-07DRTVWR-542 WIPAndrey Kleshchev
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-05-04SL-15159 Removed dead yet expensive codeAndrey Kleshchev
"prim_cost" and "description_label" do not appear to be in use, other cost data not in use
2021-04-30SL-15159 Switching uploader to 'load from file' causes a small freeze even ↵Andrey Kleshchev
if empty
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-11-18SL-14286 fixed crash when closing viewer while file picker is openMnikolenko ProductEngine
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14DRTVWR-510 merge master 6.4.11Dave Houlton
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-24SL-13888 Coding Standard: be consistent; use TAB indentPtolemy
2020-09-24SL-13888 Restore back face culling being accidently removed in SL-12781Ptolemy
2020-09-23SL-13821 Fixed checkbox not disablingAndrey Kleshchev
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-08-19SL-13821 Fix upload options affecting preview options incorrectlyAndrey Kleshchev
2020-08-12SL-13583 Some behavior tweaks #2Andrey Kleshchev
2020-08-11DRTVWR-482 Use proper reshape procedure and fix hidden bordersAndrey Kleshchev
2020-07-27SL-13483 Rename Avatar tab to "Rigging"Andrey Kleshchev
2020-05-12SL-13189 Mesh uploader - Autofill from _postfixesMnikolenko Productengine
2020-04-25SL-13123 CleanupAndrey Kleshchev
2020-04-24SL-13123 Bind shape matrix orientation warning is misbehavingAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 17:09:16 +0000