Andrey Kleshchev
|
7649114588
|
Merge branch master (DRTVWR-571) into DRTVWR-559
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
|
2022-09-16 21:07:39 +03:00 |
|
Brad Kittenbrink
|
38208441db
|
Merge remote-tracking branch 'origin/master' into DRTVWR-559
|
2022-08-04 10:59:26 -07:00 |
|
Andrey Lihatskiy
|
59ab8e78f4
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
|
2022-08-04 00:17:55 +03:00 |
|
Andrey Kleshchev
|
b08340f183
|
SL-17475 Remap models before simplification
|
2022-06-11 10:23:46 +03:00 |
|
Dave Houlton
|
8c0163bcb4
|
SL-17214 initial loader class skeleton
|
2022-06-08 13:33:59 -06: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 |
|
Dave Parks
|
6eaf8521ab
|
SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render.
|
2022-05-20 19:05:28 -05:00 |
|
Mnikolenko Productengine
|
ab9a221229
|
SL-17147 Disable simplification UI after calculating fee
|
2022-04-05 18:37:40 +03: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 Kleshchev
|
38e77cb958
|
SL-16614 Viewer's uploader crash with RenderGLCoreProfile
|
2022-01-12 20:01:36 +02:00 |
|
Dave Houlton
|
cf35d27dfb
|
DRTVWR-546 merge up to 6.5.2
|
2021-12-15 14:37:18 -07:00 |
|
Andrey Lihatskiy
|
edb6293528
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-12-15 21:50:40 +02:00 |
|
Andrey Kleshchev
|
9e38e5a187
|
SL-16471 Removed unneeded MeshOpt generation method
|
2021-12-09 00:33:57 +02:00 |
|
Andrey Kleshchev
|
27e4e245d9
|
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
|
2021-11-29 20:33:13 +02:00 |
|
Andrey Kleshchev
|
33f52ee51d
|
SL-14403 Removed glod
|
2021-11-10 17:48:55 +02:00 |
|
Dave Parks
|
f79890669d
|
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
|
2021-09-20 18:58:09 +00:00 |
|
Andrey Kleshchev
|
1a17932440
|
DRTVWR-542 Automated method selection
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
|
2021-08-04 21:14:00 +03:00 |
|
Andrey Kleshchev
|
7235d333ea
|
DRTVWR-542 Fix incorect dropbox state
|
2021-08-04 00:15:49 +03:00 |
|
Andrey Kleshchev
|
9aaac1bb98
|
DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces
|
2021-07-23 21:30:13 +03:00 |
|
Andrey Kleshchev
|
938969c811
|
DRTVWR-542 WIP #6
Trying out 'sloppy' variant
|
2021-07-12 19:18:25 +03:00 |
|
Andrey Kleshchev
|
17131ac203
|
DRTVWR-542 WIP #4
Made meshoptimizer into default generation mechanism
Ensured that at least one triangle will remain of any face
|
2021-07-11 22:39:42 +03:00 |
|
Andrey Kleshchev
|
7b7b8a8da8
|
DRTVWR-542 WIP
|
2021-07-07 22:40:37 +03:00 |
|
Callum Prentice
|
ad9ed0a94d
|
Merge with tip of Master after Viewer release
|
2021-06-07 18:55:00 -07:00 |
|
Andrey Lihatskiy
|
3c40a833ef
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-06-07 21:05:04 +03:00 |
|
Andrey Kleshchev
|
021cf914af
|
SL-15159 Removed dead yet expensive code
"prim_cost" and "description_label" do not appear to be in use, other cost data not in use
|
2021-05-04 23:59:02 +03:00 |
|
Andrey Kleshchev
|
f3806a4a05
|
SL-15159 Switching uploader to 'load from file' causes a small freeze even if empty
|
2021-04-30 19:37:26 +03:00 |
|
Callum Prentice
|
99b99a1b4a
|
Clean up a merge conflict
|
2021-04-29 13:45:15 -07:00 |
|
Dave Houlton
|
2386125ae0
|
Merge master into DV525-merge-6.4.19
|
2021-04-29 11:40:22 -06:00 |
|
Dave Houlton
|
303feae305
|
Merge branch 'master' v6.4.17 into DRTVWR-525
|
2021-03-10 09:34:16 -07:00 |
|
Callum Prentice
|
168d177197
|
This set of changes reverts the merge with master (git revert c83e740) and 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-09 14:39:51 -08:00 |
|
Andrey Lihatskiy
|
bb17e4b78e
|
Merge branch 'master' into DRTVWR-515-maint
|
2021-03-09 21:56:14 +02:00 |
|
Brad Payne (Vir Linden)
|
c83e740ef9
|
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
|
2021-03-08 13:56:16 +00:00 |
|
Dave Houlton
|
363bc9d9d0
|
Merge branch 'master' v 6.4.15 into DRTVWR-525
|
2021-03-02 14:25:36 -07:00 |
|
Andrey Lihatskiy
|
35550e36db
|
Merge branch 'master' into DRTVWR-515-maint
|
2021-03-02 21:41:26 +02:00 |
|
Mnikolenko ProductEngine
|
12d2bf4786
|
SL-14286 fixed crash when closing viewer while file picker is open
|
2020-11-18 21:09:57 +02:00 |
|
Callum Prentice
|
1cdcc00319
|
Mostly automatic merge with canonical viewer after release
|
2020-10-14 13:47:26 -07:00 |
|
Dave Houlton
|
52af846672
|
DRTVWR-510 merge master 6.4.11
|
2020-10-14 14:46:16 -06:00 |
|
Callum Prentice
|
6be1f88a5e
|
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
|
2020-09-24 14:45:39 -07:00 |
|
Ptolemy
|
4c44366c0b
|
SL-13888 Coding Standard: be consistent; use TAB indent
|
2020-09-24 11:26:46 -07:00 |
|
Ptolemy
|
88e7c15c2b
|
SL-13888 Restore back face culling being accidently removed in SL-12781
|
2020-09-24 11:20:09 -07:00 |
|
Andrey Kleshchev
|
1ef4591381
|
SL-13821 Fixed checkbox not disabling
|
2020-09-23 12:10:06 +03:00 |
|
Callum Prentice
|
2e6f516411
|
Renamed the references to LLVFile and llvfile.* source code plus cmake 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-16 21:12:53 -07:00 |
|
Callum Prentice
|
3fc07dea01
|
First part of change to remove LLVFS from the Viewer. Consists of code 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-09-16 18:53:24 -07:00 |
|
Andrey Kleshchev
|
0ee7e9dadb
|
SL-13821 Fix upload options affecting preview options incorrectly
|
2020-08-19 23:26:44 +03:00 |
|
Andrey Kleshchev
|
1f2ceb97ec
|
SL-13583 Some behavior tweaks #2
|
2020-08-12 22:53:23 +03:00 |
|
Andrey Kleshchev
|
777e896ee4
|
DRTVWR-482 Use proper reshape procedure and fix hidden borders
|
2020-08-11 21:28:05 +03:00 |
|
Andrey Kleshchev
|
0570d6d3c1
|
SL-13483 Rename Avatar tab to "Rigging"
|
2020-07-27 22:32:49 +03:00 |
|
Mnikolenko Productengine
|
70fe69ea43
|
SL-13189 Mesh uploader - Autofill from _postfixes
|
2020-05-12 19:02:48 +03:00 |
|
Andrey Kleshchev
|
4ac08f1ac5
|
SL-13123 Cleanup
|
2020-04-25 15:12:53 +03:00 |
|
Andrey Kleshchev
|
aa014a65e7
|
SL-13123 Bind shape matrix orientation warning is misbehaving
|
2020-04-24 20:51:07 +03:00 |