summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.h
AgeCommit message (Collapse)Author
2022-11-11SL-18627: Make space for pbr transform controls in build floater and disable ↵Cosmic Linden
some WIP controls
2022-11-03SL-18448 Save material button in tools floaterAndrey Kleshchev
2022-10-29SL-18448 Material Editor and Tools floater adjustmentsAndrey Kleshchev
1. Enable glow 2. Added buttons to texture->pbr
2022-10-14WIP for SL-18103 and SL-17697 live editing of materials using ↵Brad Kittenbrink (Brad Linden)
ModifyMaterialParams cap
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-01SL-17999 PBR material in tool's texture tabAndrey Kleshchev
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04DRTVWR-544 Post-merge build fixAndrey Lihatskiy
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-05-06SL-17198 fixes to get material asset serialization working betterBrad Kittenbrink
2022-05-05SL-17325 apply inventory material to faceDave Houlton
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for ↵Brad Kittenbrink
Materials
2022-04-27Test UI for SL-17116. provide a debug interface to set a MaterialID for a faceBrad Kittenbrink
2022-04-27Prototype a SaveMaterial buttonDave Houlton
2022-04-19SL-17231 Copying textures should be disabled if object content was not yet ↵Mnikolenko Productengine
updated
2022-02-01SL-16344 #6 Fixed 'choose media' button not working in some casesAndrey Kleshchev
2022-01-18SL-16344 #5 CleanupAndrey Kleshchev
2022-01-17SL-16344 #4 Only load 'title' media if it is neededAndrey Kleshchev
Mostly for the sake of MAC. setVolume(0) doesn't work on MAC which resulted in invisible media playing in background when editor was open.
2022-01-17SL-16344 #3 Moved LLPanelFace related code into LLPanelFaceAndrey Kleshchev
2020-06-23SL-12688 Warnings part #1Andrey Kleshchev
2020-06-19SL-13359 #9 Texture tabAndrey Kleshchev
2020-06-19SL-13359 #8 Reverted changes to texture tabAndrey Kleshchev
This reverts commit 1e1707d532560583744bb877adfed11864f2db31.
2020-06-17SL-13359 #5 Implemented revised changesAndrey Kleshchev
2020-06-02SL-13359 #1 Revert floater_tools and object panel changesAndrey Kleshchev
2020-02-19SL-12473 FIXED Copied texture params get duplicated when pasting to objects ↵maxim_productengine
that use different face counts.
2019-10-14Merged in andreyl_productengine/486-copypasteKadah_Coba
2019-10-14[Project Copy/Paste] Texture supportKadah_Coba
2019-04-04SL-5570 - Align planar faces" does not work on normal or specular mapsruslantproductengine
SL-10864 -Normal and Specular textures can be rotated with checked align planar faces checkbox Implement separate texture layers alignment.
2019-02-04SL-5570 - Align planar faces" does not work on normal or specular mapsruslantproductengine
2018-07-31Fix broken init of defaulted arg that MSVC should not have let slide.Graham Linden
2018-07-31MAINT-8909Graham Linden
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-30MAINT-8915Graham Linden
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-02MAINT-3219 make align planar faces set normal and specular offsets and ↵Graham Linden
rotations in addition to the diffuse values
2017-04-27MAINT-3223 Texture repeats synch featureMnikolenko Productengine
2017-01-30MAINT-3216 Fixed "Vertical scale" does not change "Repeats per meter" on "Tab"andreykproductengine
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-11Backed out changeset: a79540758404ruslantproductengine
Need backed out this changes because it influence on material update see: MAINT-5818 Also this lead to the following: UserA and UserB logged in same location. UserA edit normal/specular map texture offsets while UserB is not observe this changes.
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-05-19MAINT-3548 - FIXED-R2 Horizontal & vertical offset values for normal & ↵vyacheslavsproductengine
specular maps still randomly revert to previous settings when building.
2014-10-10MAINT-3202 FIXED Cancel of selected colour in "Colour picker" floater does ↵andreykproductengine
not return colour icon to previous condition
2013-10-08merge from viewer-releaseRichard Linden
2013-10-01Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-09-18The unbearable lightness of being norspecGraham Linden
2013-08-12NORSPEC-346 fix knock-on causing alpha mask edits to cause materials to get ↵Graham Linden
removed and revert to alpha blend
2013-08-07NORSPEC-343 fix oversight and actually apply override to new material when ↵Graham Linden
no alpha is present
2013-08-07NORSPEC-343 protect against edits that would set non-alpha faces to diffuse ↵Graham Linden
alpha mode blend
2013-08-07NORSPEC-329 fix mangling of diffuse alpha mode by material edits when only ↵Graham Linden
one face really has alpha
2013-06-20merge with releaseRichard Linden
2013-06-20NORSPEC-262 make drag and drop aware of editing context so that editing ↵Graham Linden
normal/spec textures causes application to the correct tex channel
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 00:09:43 +0000