bc7c4fb82a
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm
2021-06-07 20:55:41 +02:00
99027205df
FIRE-30965 Improve mesh upload error + rewrite subset checks
...
Rewrite material parsing to properly implement material subset with the NoGeometry tag.
2021-05-28 03:07:14 +01:00
42458a2049
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm
2021-05-27 10:50:17 +02:00
e2fd2687d4
FIRE-30963 - better physics defaults
2021-05-18 23:27:52 +01:00
52ce165290
uploader error cleanup round 1
2021-05-17 21:25:05 +01:00
c516f1fc9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:50:45 +02:00
3804ec1d03
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-04 08:35:13 +01:00
f3961a9510
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-03 20:17:57 +01:00
6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
6c587d437d
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-02 08:17:58 +01:00
379f1a424e
Add preferences tab to uploader
2020-11-26 01:06:42 +00:00
12d2bf4786
SL-14286 fixed crash when closing viewer while file picker is open
2020-11-18 21:09:57 +02:00
ffaa950312
Various fixes and repairs to mesh uploader
...
* re-establish proper shading of degenerate triangles in phsyics
* restore configurable settings
* fix shader lighting and re-align default base colour to not be overexposed.
2020-10-27 21:36:40 +00:00
1cdcc00319
Mostly automatic merge with canonical viewer after release
2020-10-14 13:47:26 -07:00
52af846672
DRTVWR-510 merge master 6.4.11
2020-10-14 14:46:16 -06:00
f89c21cca6
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-09-29 13:21:01 +02:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
4c44366c0b
SL-13888 Coding Standard: be consistent; use TAB indent
2020-09-24 11:26:46 -07:00
88e7c15c2b
SL-13888 Restore back face culling being accidently removed in SL-12781
2020-09-24 11:20:09 -07:00
1ef4591381
SL-13821 Fixed checkbox not disabling
2020-09-23 12:10:06 +03:00
f323e34b07
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-09-23 06:53:16 +02:00
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
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
0ee7e9dadb
SL-13821 Fix upload options affecting preview options incorrectly
2020-08-19 23:26:44 +03:00
e77edc8ed1
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-08-19 13:06:53 +02:00
1f2ceb97ec
SL-13583 Some behavior tweaks #2
2020-08-12 22:53:23 +03:00
c5af669e3b
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-08-12 12:24:35 +02:00
777e896ee4
DRTVWR-482 Use proper reshape procedure and fix hidden borders
2020-08-11 21:28:05 +03:00
7114ab1ea8
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-07-28 21:02:08 +02:00
0570d6d3c1
SL-13483 Rename Avatar tab to "Rigging"
2020-07-27 22:32:49 +03:00
15b3bff646
+ auto weight enable, verbose logging
...
also a couple of formatting fix ups.
* misplaced STATUS and NOTE
* use bone offsets checkbox not enough vertical space
2020-07-07 01:25:39 +01:00
7bb1b025b8
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-05-19 14:01:34 +02:00
70fe69ea43
SL-13189 Mesh uploader - Autofill from _postfixes
2020-05-12 19:02:48 +03:00
c67e74a691
Build fix
2020-04-25 19:23:16 +02:00
92e7843fcf
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/lltabcontainer.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmodelpreview.cpp
2020-04-25 17:26:59 +02:00
4ac08f1ac5
SL-13123 Cleanup
2020-04-25 15:12:53 +03:00
aa014a65e7
SL-13123 Bind shape matrix orientation warning is misbehaving
2020-04-24 20:51:07 +03:00
3cc83b2e37
SL-307 Improvements to logging
2020-04-24 18:29:18 +03:00
a0e91e9e50
SL-307 Improvements to flashing color
2020-04-24 18:05:14 +03:00
0bc76461fa
SL-13080 Mac build fix
2020-04-24 02:47:18 +03:00
c0ed9d28f1
SL-13080 Filter out default overrides
2020-04-24 02:37:35 +03:00
9221c8a3f6
SL-13080 Changes for joint listings in mesh uploader
2020-04-23 20:51:06 +03:00
73cbce5b02
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-04-23 18:40:28 +02:00
abee63cddc
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-04-23 18:31:20 +02:00
72ba7f1dad
SL-13077 remove floater specific variables from settings.xml
2020-04-22 20:55:57 +03:00
2b459cc80e
SL-13078 Split LLModelPreview and LLFloaterModelPreview into separate files
2020-04-22 20:02:39 +03:00
462b0b1c2d
SL-13066 FIXED Model preview with is displayed when the ‘Upload Model’ floater is minimized
2020-04-22 15:57:34 +03:00
311921cad6
SL-13064 Artifacts on the preview with physics
2020-04-21 17:33:14 +03:00
1f8f3d13d0
SL-10613 The Smooth parameter should be 0 by default
2020-04-21 15:41:42 +03:00
Ansariel