Commit Graph

209 Commits (cfb2b95c8ca3dbd9761bbd2124cf0361a4832bce)

Author SHA1 Message Date
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
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
andreykproductengine b3e7fff9ae MAINT-2199 restored original UI mechanics, removed icons from UI list 2016-02-27 16:06:54 +02:00
andreykproductengine 10e2bd56c1 MAINT-2199 In some rare cases priorities can change, it shouldn't affect texture list. 2016-02-18 17:35:43 +02:00
andreykproductengine a0e9ee4757 MAINT-2199 separating UI elements from in-world textures. 2016-02-16 20:44:53 +02:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine b996f2ca55 MAINT-5588 FIXED Make bumpiness and shininess easier to find in the texture tab, with radio buttons 2015-09-09 16:22:40 +03:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
andreykproductengine 5a1f4ac1a7 MAINT-3205 FIXED Normal map thumbnail icon lacks "Multiple" text when last-selected face lacks a normal map 2014-11-27 17:20:45 +02:00
callum_linden a37c41e3f5 Update to build on Xcode 6.0: removal of some unused variables 2014-10-19 17:30:46 -07:00
andreykproductengine a9692c233e MAINT-3202 FIXED Cancel of selected colour in "Colour picker" floater does not return colour icon to previous condition 2014-10-10 09:20:42 +03:00
andreykproductengine 1874170f4f MAINT-4255 FIXED In the Edit menu when opening the texture picker for normal map selection and clicking Cancel the already applied texture is changed to None even with or without any prior change or if the prior applied texture was full perms. 2014-07-22 15:43:18 +03:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00