summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Collapse)Author
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-10-30Fix checks for empty LLSD maps to use size and not emptyMap which is for ↵Rye Mutt
creating an empty LLSDMap type.
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.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-08-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.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-26Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
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-03SL-9748 - Only supply a default physics shape if it is named ↵Howard Stearns
default_physics_shape
2022-03-02SL-9748 - more casesHoward Stearns
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' of bitbucket.org:lindenlab/viewer into SL-9749Howard Stearns
2022-02-22SL-9748 - coding standardHoward Stearns
2022-02-22SL-9748 - Option to compute uploaded mesh physics shape from a cube.Howard Stearns
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 05:56:55 +0000