summaryrefslogtreecommitdiff
path: root/indra/newview/lltooldraganddrop.cpp
AgeCommit message (Collapse)Author
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
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-19Merge from viewer release.Rider Linden
2015-09-24MAINT-5282: I've removed most of the depricated Merchant Outbox code and the ↵Rider Linden
links to it in the menus. Also removed the Outbox Floater and made the folder always hidden if empty in inventory. (There may still be some outstanding Outbox code that was not obvious that I have missed.)
2015-09-04MAINT-5416 FIXED Cannot right-click a rigged mesh that's wornAndreyL ProductEngine
--HG-- branch : maint-5416
2015-08-25MAINT-5547 FIXED errors when texturing a linkset "Unable to add texture. ↵andreykproductengine
Please wait a few seconds and try again."
2015-08-04Merge downstream code and become version 3.8.3andreykproductengine
2015-08-04Merge viewer-release and become version 3.8.3AndreyL ProductEngine
2015-07-23MAINT-5416 Reverted changeset: 9bd24c17d908AndreyL ProductEngine
2015-07-17MAINT-5416 FIXED cannot right-click a rigged mesh that's wornAndreyL ProductEngine
2015-07-17MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or ↵andreykproductengine
selected
2015-04-28increment viewer version to 3.7.29Mnikolenko ProductEngine
2015-04-28Merge viewer-release, become version 3.7.29Mnikolenko ProductEngine
2015-04-14Pull merge from lindenlab/viewer-tools-update (includes viewer-release)Merov Linden
2015-04-13merge changes for 3.7.27-releaseOz Linden
2015-03-16Merge lindenlab/viewer-tools-updateMerov Linden
2015-03-03MAINT-4897 FIXED Frequent error when texturing a linkset - "Unable to add ↵andreykproductengine
texture. Please wait a few seconds and try again."
2015-01-13merge changes for 3.7.24-releaseOz Linden
2015-01-16MAINT-4799 FIXED Show complete avatar names in confirmation dialog.Mnikolenko ProductEngine
2014-12-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-10-20Update to build on Xcode 6.0: cast doesn't change overloading rules - poorly ↵callum_linden
commented
2014-09-28Pull merge from lindenlab/viewer-releaseMerov Linden
2014-08-11MAINT-4086 FIXED Limit the number items "Replace Current Outfit" or "Wear" ↵andreykproductengine
applies to Nested folders fix
2014-07-22Sync merge with lindenlab/viewer-releaseMerov Linden
2014-07-01MAINT-4086 FIXED Limit the number items "Replace Current Outfit" or "Wear" ↵andreykproductengine
applies to
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 12:36:49 +0000