Brad Kittenbrink
6095a7d310
SL-17198 more fixes to get material asset serialization working better
2022-05-06 10:05:23 -07:00
Brad Kittenbrink
356817d2fc
SL-17198 fixes to get material asset serialization working better
2022-05-06 10:02:47 -07:00
Brad Kittenbrink
afe5d1f270
Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17116-material-messaging
2022-05-06 08:38:45 -07:00
Brad Kittenbrink (Brad Linden)
c9be81a747
SL-17198 material asset uploading now suuceeeds.
2022-05-06 08:26:19 -07:00
Dave Houlton
cce5fdca84
SL-17325 apply inventory material to face
2022-05-05 15:38:16 -06:00
Dave Houlton
f05e58715e
SL-17116, SL-17277 single-face material save only
2022-04-29 17:04:22 -06:00
Brad Kittenbrink
cc04903379
Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging
2022-04-28 14:05:49 -07:00
Brad Kittenbrink
c9ef206e39
Beginning viewer side work for SL-17198 new asset and inventory types for Materials
2022-04-28 13:08:37 -07:00
Dave Houlton
b08742d0b3
Add a (broken) material upload handler fxn
2022-04-28 11:53:43 -06:00
Brad Kittenbrink
3f43553ea0
Test UI for SL-17116. provide a debug interface to set a MaterialID for a face
2022-04-27 14:55:06 -07:00
Dave Houlton
c4625d26e5
Prototype a SaveMaterial button
2022-04-27 12:18:30 -06:00
Mnikolenko Productengine
a95d846a5c
SL-16218 treat texture selection similar to diffuse map handling.
2021-10-25 15:15:02 +03:00
Dave Houlton
86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06:00
Andrey Lihatskiy
e0727702ea
Merge branch 'DRTVWR-501' into trunk
2020-02-03 15:18:34 +02:00
maxim_productengine
e83da3f5e2
SL-12453 FIXED The "Align planar faces" checkbox is visible in the Default mapping mode
2019-12-16 14:36:33 +02:00
AndreyL ProductEngine
4dd3d230ec
Merged in lindenlab/viewer-release
2019-11-14 23:44:45 +02:00
ruslantproductengine
2b8acfea0e
SL-11840 [Bakes on Mesh] Enable bake textures to be applied to non-attached editable items
...
- Now bake texture channel's available for assign for non attached objects
2019-10-18 22:38:33 +03:00
andreykproductengine
e439f0366f
Merge from lindenlab/viewer-release
2019-08-29 15:43:02 +03:00
andreykproductengine
be7713cab2
Merged in lindenlab/viewer-release
2019-08-14 15:02:56 +03:00
Brad Payne (Vir Linden)
15db923cae
merge
2019-08-13 20:08:37 +01:00
andreykproductengine
8369276a49
DRTVWR-493 LLViewerMedia to singleton
2019-06-21 20:55:39 +03:00
Anchor
504a138cb1
Merge
2019-05-10 12:22:29 -06:00
AndreyL ProductEngine
aefb0503aa
Merged in lindenlab/viewer-release
2019-05-08 00:09:53 +03:00
Anchor
4b1c786c6e
Merge
2019-04-10 11:47:57 -07:00
ruslantproductengine
1d994e7702
SL-5570 - Align planar faces" does not work on normal or specular maps
...
SL-10864 -Normal and Specular textures can be rotated with checked align planar faces checkbox
Implement separate texture layers alignment.
2019-04-04 19:18:50 +03:00
AndreyL ProductEngine
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03:00
ruslantproductengine
986567a654
SL-5570 - Align planar faces" does not work on normal or specular maps
2019-02-04 18:14:03 +02:00
Anchor
56bf3287b8
Merge
2019-01-29 21:38:05 -08:00
maxim_productengine
224c657163
SL-10235 FIXED Texture tab is opened with Bumpiness or Shininess instead of Texture as default value
2018-12-18 17:23:55 +02:00
AndreyL ProductEngine
74a56f30aa
Merged in lindenlab/viewer-release
2018-12-14 00:46:11 +02:00
Anchor Linden
076719013e
Merge
2018-10-11 10:54:16 -07:00
andreykproductengine
3a52138829
SL-9781 Colour picker floater preiodically reverts color without 'apply now'
2018-10-10 20:32:28 +03:00
AndreyL ProductEngine
892d3a9bf8
Merged in lindenlab/viewer-release
2018-09-27 13:04:12 +03:00
Oz Linden
f1d4e788e7
SL-967 simplify viewer log file field syntax
...
MAINT-8991: only escape log message characters once, add unit test
remove extra log line created by LL_ERRS
document that tags may not contain spaces
2018-08-29 16:43:45 -04:00
Graham Linden
d748dbce45
MAINT-8909
...
Loosen precision when checking rotation and other false negatives when comparing
faces to see if they can be considered planar aligned. This was causing fields to
be marked tentative (grayed display) incorrectly.
2018-07-31 17:35:42 +01:00
Graham Linden
60d256e80f
MAINT-8915
...
Fix sync of material rotation and offset values when using aligned planar faces.
Make it possible to set a specific TE's normal/spec offset/rotation values.
Eliminate redundant conversions in LLSD -> struct handler.
2018-07-30 22:38:30 +01:00
Graham Linden
c530b3d151
MAINT-3219 make align planar faces set normal and specular offsets and rotations in addition to the diffuse values
2018-07-02 21:12:03 +01:00
Anchor Linden
b48ca9da47
Merge
2018-06-27 17:45:35 +05:30
andreykproductengine
177f24f56f
MAINT-8586 Eliminate obsolete xui elements
2018-05-29 17:26:10 +03:00
Anchor Linden
3bf89821d9
[DRTVWR-455] - added 5 new bake channels
2018-05-21 16:00:52 -07:00
Anchor Linden
f335414435
fixed MAINT-8413,8409,8408
2018-03-21 01:40:35 -07:00
Anchor Linden
8f64a9edea
[MAINT 8081] - show/hide avatar base mesh regions if avatar joint attachments are using server bakes. pass the magic ids correctly across ui and texture entry.
2018-03-02 02:25:59 -08:00
Mnikolenko Productengine
788d745071
MAINT-7899 FIXED Apparent broken material texture selection
2017-10-13 12:23:08 +03:00
Mnikolenko Productengine
012ba25d45
MAINT-7811 FIXED The "Use Texture" option appears when it shouldn't be displayed
2017-09-19 11:15:51 +03:00
Mnikolenko Productengine
69db7cd947
MAINT-3223 Texture repeats synch feature
2017-04-27 17:26:32 +03:00
andreykproductengine
bd3815699c
MAINT-3216 Fixed "Vertical scale" does not change "Repeats per meter" on "Tab"
2017-01-30 20:02:59 +02:00
Oz Linden
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
andreykproductengine
0e155c51a9
MAINT-6257 Textures loading issues.
2016-03-29 18:52:54 +03:00
Oz Linden
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
andreykproductengine
30f9287645
MAINT-2199 reverted previous change, refixed missing cloud and ban line
2016-03-03 00:15:33 +02:00