summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Collapse)Author
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
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
2020-04-24SL-307 Improvements to loggingAndrey Kleshchev
2020-04-24SL-307 Improvements to flashing colorAndrey Kleshchev
2020-04-24SL-13080 Mac build fixAndrey Kleshchev
2020-04-24SL-13080 Filter out default overridesAndrey Kleshchev
2020-04-23SL-13080 Changes for joint listings in mesh uploaderAndrey Kleshchev
2020-04-22SL-13077 remove floater specific variables from settings.xmlAndrey Kleshchev
2020-04-22SL-13078 Split LLModelPreview and LLFloaterModelPreview into separate filesAndrey Kleshchev
2020-04-22SL-13066 FIXED Model preview with is displayed when the ‘Upload Model’ ↵Mnikolenko Productengine
floater is minimized
2020-04-21SL-13064 Artifacts on the preview with physicsAndrey Kleshchev
2020-04-21SL-10613 The Smooth parameter should be 0 by defaultMnikolenko Productengine
2020-04-21SL-13075 Fixed the uploaded model preview sizeAndrey Lihatskiy
2020-04-21Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/shaders/class1/objects/previewV.glsl # indra/newview/lldynamictexture.cpp # indra/newview/llfloatermodelpreview.cpp
2020-04-17SL-13065 Fixed missing error and infinite cycle caused by too much loggingAndrey Kleshchev
2020-04-17SL-13061 Fixed missing scroll handlingAndrey Kleshchev
2020-04-15SL-307 ImporterDebug is now logged into in-viewer logAndrey Kleshchev
2020-03-31SL-379 Render selected joint yellow when Avatar tab is openAndrey Kleshchev
2020-03-30SL-307 A separator to see where model loading logs ends and other state startsAndrey Kleshchev
2020-03-30SL-379 Remake Overrides tab into AvatarAndrey Kleshchev
2020-03-30SL-379 Do not disable tabsAndrey Kleshchev
2020-03-27SL-307 Implemented ability to specify color and changed flashing colorAndrey Kleshchev
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-03-12SL-12781 Remove expensive and redundant z clear; instead enable/disable z ↵Ptolemy
test for background and model preview
2020-03-12SL-12781 Cleanup: Remove HACK / MAGIC NUMBER effective constant of ↵Ptolemy
mCameraDistance as it is set in setPreviewTarget() via initModelPreview()
2020-03-12SL-12781 Cleanup: Rename non-descript generic var namePtolemy