summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.h
AgeCommit message (Collapse)Author
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-08-17SL-17699 Add upport for materials to texture picker. A work in progress but ↵Callum Prentice
I am about to make some larger changes to inventory code so I wanted to secure this first
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch master (DRTVWR-561) into DRTVWR-483Andrey Kleshchev
2022-06-24SL-17640 Materials Upload UI #1Andrey Kleshchev
1. Allow 'none' textures 2. Disable 'apply now' buttons 3. Switch from loading dae files to just gltf glb
2022-04-15SL-17204 FIXED The texture with full permissions is settled on the prim ↵Mnikolenko Productengine
after copying texture from the object with texture with no transfer permission
2020-09-28Merged master(DRTVWR-497) into DRTVWR-486Andrey Kleshchev
2020-09-23Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2020-09-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-06-24SL-12688 Warnings part #2Andrey Kleshchev
2020-06-17SL-13359 #5 Implemented revised changesAndrey Kleshchev
2020-02-18SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlapsAndrey Kleshchev
2019-11-11Backed out changeset: 19f3fa6e3e63andreykproductengine
2019-10-01SL-6109 Implemented LLDrawFrustumandreykproductengine
2019-10-18SL-11840 [Bakes on Mesh] Enable bake textures to be applied to non-attached ↵ruslantproductengine
editable items - Now bake texture channel's available for assign for non attached objects
2019-09-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-06-25SL-11431 [Legacy Profiles] Clicking someone else's profile picture should ↵maxim_productengine
open image modal.
2018-06-28[MAINT 8434] - fix mode select doesnt change on drag n drop,Anchor Linden
[MAINT 8410] - fix eye dropper still active after switching to bake mode, [MAINT 8464] - fix bake mode active for non attached objects
2018-06-27MergeAnchor Linden
2018-05-23MAINT-8619 Disable local textures for selection in Group profilemaxim_productengine
2018-03-21fixed MAINT-8413,8409,8408Anchor Linden
2018-03-02[MAINT 8081] - show/hide avatar base mesh regions if avatar joint ↵Anchor Linden
attachments are using server bakes. pass the magic ids correctly across ui and texture entry.
2018-02-28[MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to select ↵Anchor Linden
bakes on objects. handle magic bake ids in LLViewerObject.
2016-11-25MAINT-6961 FIXED Some textures(copied from Library) couldn't be set as ↵Mnikolenko Productengine
Outfit image via "Select image" although drag and drop works fine
2016-08-01MAINT-6602 disable ability to select local texturesMnikolenko Productengine
2016-07-26MAINT-6476 VOB - User can add any size image to an Outfit Gallery outfit folderspavelkproductengine
Added restriction of image size that can be added to outfit via "Select Photo"
2016-05-24Merge VOB with release 4.0.6pavelkproductengine
2016-04-05MAINT-6228 Update Photo/Image Upload feature for Outfit Browserpavelkproductengine
1) Added "Select Photo" to outfit gear menu 2) Incorporated Texture Picker
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-07-08SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics ↵Richard Linden
console added percentage/ratio units added auto-range and auto tick calculation to stat bar to automate display stats
2013-06-11NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI ↵Graham Madarasz
correctly and fix issues with transition from no-bumps to normal maps
2013-05-14NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in ↵Graham Madarasz
graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
2013-04-26Merge viewer-dev-mat and fix llvovolume.cpp missed sunshine mergesGraham Madarasz
2013-04-25add isPickerShown methodOz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-06-22mergeDave Parks
2012-05-22MAINT-119 FIXED (PUBLIC]no-transfer textures not searchable via texture picker)Paul ProductEngine
- Implemented Richard's and Leo's spec - Also fixed an issue when applying no-transfer texture for an object using texture picker, creates redundant copies of the texture in the object's content
2012-04-02storm-64: Local TexturesVaalith Jinn
2011-09-06EXP-1196 FIX Fix param block template orderingRichard Linden
changed ordering of template loading relative to constructor setting of params moved a lot of constructor-set params to template files reviewed by Leslie
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-24EXT-7046 FIX User profile using wrong placeholder/generic profile pic artRichard Linden
2010-05-17EXT-7045 FIX miss one more texture setup place.Yuri Chebotarev
Also remove redundant variable and do some refactoring. Reviwed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/391/ --HG-- branch : product-engine
2010-03-03Implemented major sub task EXT-5858 - Assigned picture is stretched in the ↵Dmitry Zaporozhan
Classified Info panel. Reshape snapshot control to max possible size maintaining aspect ratio. --HG-- branch : product-engine
2010-01-22Fixed bug EXT-4583 ([BSI] Changing group image via drag and drop from ↵Vadim Savchuk
Inventory floater doesn't trigger "save" button to become active). Modified LLTextureCtrl's no_commit_on_selection paramater behavior so that the widget gets dirty only on DnD or when the OK button is pressed in the picker. This is needed for panels that rely on LLTextureCtrl::isDirty() to enable their "Apply" button. --HG-- branch : product-engine
2010-01-20Fixed bug EXT-4369 ([BSI] Changing image in "Pick" doesn't trigger "Save ↵Vadim Savchuk
Pick" button to be active) * Changed the Save button to react on texture picker commit, not on selection. * Added an optional "no_commit_on_selection" parameter to LLTextureCtrl to commit only when user presses the OK button in the picker or changes the texture via DnD, i.e. browsing in the picker doesn't commit. --HG-- branch : product-engine
2009-12-22fixed minor bug EXT-3627 'Loading..' is shown over second life icon in view ↵Andrew Polunin
profile panel --HG-- branch : product-engine
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ↵James Cook
for now, not complete. Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 04:19:34 +0000