summaryrefslogtreecommitdiff
path: root/indra/newview/lltooldraganddrop.cpp
AgeCommit message (Collapse)Author
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-03-27Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # indra/llui/lltransutil.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfloaterenvironmentadjust.cpp # indra/newview/llpaneleditwater.cpp # indra/newview/llpanelface.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h
2024-02-02Issue #26 Support texture drop onto PBR materialsAndrey Kleshchev
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-31SL-20549 Blank no-copy materials are not moved into scripted objectsAndrey Kleshchev
2023-10-16SL-20382 Warn when moving no-copy items on dropAndrey Kleshchev
2023-10-03Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventorybridge.cpp # indra/newview/lltexturectrl.h # indra/newview/llvovolume.cpp
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-09-22SL-15039 Prune unused preferences #3Andrey Kleshchev
DebugInventoryFilters DebugShowXUINames DebugSlshareLogTag DebugStat**** DefaultBlankNormalTexture DefaultObjectNormalTexture DefaultObjectSpecularTexture DefaultUploadCost DisplayAvatarAgentTarget DisplayChat DisplayDebug DisplayDebugConsole DisplayIM DisplayLinden DisplayRegion DragAndDropToolTipDelay DragAndDropDistanceThreshold DropShadowButton DropShadowFloater DropShadowSlider DropShadowTooltip UIImgWhiteUUID UseEnvironmentFromRegion UseDayCycle WaterPresetName SkyPresetName DayCycleName DestinationGuideHintTimeout SidePanelHintTimeout DisablePrecacheDelayAfterTeleporting
2023-09-19SL-5522 Fix applying textuers and materials with limited restrictions to ↵Andrey Kleshchev
attachments 1. Texture picker now updates filter's permissions based on selection 2. Various panels now properly check permissions
2023-08-14SL-20024: Fix inventory not marked dirty for drag and drop if copy ↵Cosmic Linden
permission bit is unset
2023-08-11SL-20024: Put material in object inventory when material is no-modify or ↵Cosmic Linden
no-transfer
2023-08-11SL-20024: Early returnCosmic Linden
2023-08-11SL-20024: Generalize some comments/errorCosmic Linden
2023-07-14Fix crash SL-20013 crash when applying nocopy material via drag-and-dropBrad Linden
2023-07-07SL-19958 An inventory material without asset should default to a blank materialAndrey Kleshchev
A New Material created in Inventory should be immediately usable.
2023-05-12SL-19649 Adjust other classes for new deleteAllChildren mechanicsAndrey Kleshchev
2023-05-04SL-18932 Canceling material selection only reverts overrideAndrey Kleshchev
2023-03-10SL-18629 WIP Replacing UDP creation messages with callback based AIS #2Andrey Kleshchev
findCategory and move_item_to_marketplacelistings
2023-02-10SL-19200 No-copy materials cannot be moved on objects using drag and dropAndrey Kleshchev
We allow droping no-copy textures and materials into object's inventory, and we allow asigning them from picker, there should be no reason why drag &drop should be different
2023-01-10SL-18932 Canceling in material picker removes dropped materialAndrey Kleshchev
2023-01-04SL-18854 Fix drag'n drop of plain textures on faces in PBR modeAndrey Kleshchev
When in PBR 'mode', defaulted texture drops to diffuse channel
2022-12-16SL-18854 Prevent texture drop onto faces that have pbrAndrey Kleshchev
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-09-27SL-17999 Material with limited permissions should be copied to object's ↵Andrey Kleshchev
inventory
2022-09-22SL-18119 - log group join, object add or rezBrad Payne (Vir Linden)
2022-09-22SL-17999 'copy' functionality for 'features' and 'texture' tabsAndrey Kleshchev
And a fix to prevent message spam
2022-09-14SL-18044 (PBR) No-copy textures not applying to objectsAndrey Kleshchev
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-06-29SL-17685 Drag and drop material supportDave Parks
2022-06-29SL-17685 Drag and drop material support WIPDave Parks
2022-04-26SL-16026 FIXED Copying only one diffuse texture allows pasting this texture ↵Mnikolenko Productengine
into other types of textures
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-08-15SL-209 Cleanup Merchant Outboxandreykproductengine
2018-11-14MergeRider Linden
2018-08-03MergeRider Linden
2018-08-02mergeBrad Payne (Vir Linden)
2018-06-20Adding settings DAD typeRider Linden
2018-06-05MAINT-8706 Require holding Control key to drag folders into in world objectsmaxim_productengine
2018-05-18mergeBrad Payne (Vir Linden)
2018-02-20MAINT-6260 Fixed Rezing from trash causes dupes after restartandreykproductengine
2017-12-19SL-713, MAINT-7709 - experimental setting to allow left-click interaction ↵Brad Payne (Vir Linden)
with animesh. Disabled by default. Still doesn't work in all cases and has significant performance impact
2017-06-15MAINT-7483 Fixed inability to drag a folder into object contentsandreykproductengine
2017-02-15MAINT-7118 Swapping legacy people API with new cacheandreykproductengine
2016-05-20Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-04-04merge with 4.0.3-releaseOz Linden
2016-03-31Faster to copy changes than merge branches.Aura Linden
2016-01-15merge changes for 4.0.1-releaseOz Linden
2016-01-15Merge VRRider Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-23 11:13:17 +0000