summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2025-10-25Merge tag 'Second_Life_Release#01823996-2025.08' into 2025.08Erik Kundiman
2025-10-13#2818 Creating a link to an empty notecard failsAndrey Kleshchev
2025-08-21Merge tag 'Second_Life_Release#143de1dd-2025.06' into 2025.06Erik Kundiman
2025-08-15#4537 Some links were missing favorite optionsAndrey Kleshchev
2025-08-08Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06Erik Kundiman
2025-07-23#4209 Outfits should have an "Add to Favorites" optionAndrey Kleshchev
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-29Merge tag 'Second_Life_Project#b9ab6c36-2025.05' into 2025.05Erik Kundiman
2025-05-28Merge branch 'main' into marchcat/2505-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h
2025-05-22Merge tag 'Second_Life_Release#a31b7ae2-Second_Life_Release#a31b7ae-2025.04' ↵Erik Kundiman
into 2025.04
2025-05-13#4071 Permit pasting links into outfitsAndrey Kleshchev
Like it's permitted to drop them
2025-05-13#4060 Fix subfolders use through ctrl-vAndrey Kleshchev
2025-05-13#4055 Fix subfolder draggingAndrey Kleshchev
2025-05-09Merge tag 'Second_Life_Release#377d1b38-2025.04' into 2025.04Erik Kundiman
2025-05-08#3757 Smarter subfolders dragndropAndrey Kleshchev
2025-04-29#3993 Fix missing 'add to favorites' optionAndrey Kleshchev
2025-04-19Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
2025-04-19Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04Erik Kundiman
2025-04-15#3757 Disable ability to create folders in individual outfitsAndrey Kleshchev
This part needs a recheck
2025-04-15Merge branch 'main' into marchcat/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp
2025-04-11#3757 Move for subfodlersAndrey Kleshchev
2025-04-11#3757 Menu for subfodlers in outfits p2Andrey Kleshchev
2025-04-11#3757 Menu for subfodlers in outfitsAndrey Kleshchev
2025-04-11#3757 Allow subfolders in "My Outfits"Andrey Kleshchev
2025-04-11#3383 'InventoryAddAttachmentBehavior' setting should affect inventory panel ↵Maxim Nikolenko
in List view; update persistence of new settings
2025-04-10Merge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp
2025-03-22Merge tag 'Second_Life_Release#0ec9bfaa-2025.03' into 2025.03Erik Kundiman
2025-03-19#3685 add test floater for new slappsMaxim Nikolenko
2025-03-11triage#163 'Create folder from selected' misbehaves in marketplaceAndrey Kleshchev
Marketplace deliberately doesn't allow creating folders and the "New folder from selected" is a way of creating a new folder then moving selected items inside, therefore shouldn't be allowed.
2025-03-11viewer#1104 Crash at populateFoldersListAndrey Kleshchev
Ensure folder creation callbacks remain alive # Conflicts: # indra/newview/llfloatercreatelandmark.cpp # indra/newview/llfloatercreatelandmark.h
2025-02-18Merge commit '0679cbdec89fbd3ec470768bdf469f6a1d326859' into tmpErik Kundiman
2025-02-07#3505 Make inventory run less content checksAndrey Kleshchev
2025-02-07#3505 Make checkFolderForContentsOfType cheaperAndrey Kleshchev
2024-10-18Merge branch 'main' into 2024.09-ExtraFPSErik Kundiman
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-09Minimal favorite folder inventory featuregwigz
Utilizes the recent-ish "open in new window" functionality from `LLPanelMainInventory::newFolderWindow`
2024-09-08#459 Filters on object inventoryAlexander Gavriliuk
2024-09-01Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into ↵Erik Kundiman
2024.08-DeltaFPS
2024-08-20Clean up boost includes and remove compiler warning pragma for unreachable ↵Ansariel Hiller
code in PCH (#2361)
2024-08-19Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-08-09Fix rare shutdown crash in gCacheNameRye Mutt
2024-08-09Fix nullptr crash in LLInvFVBridge::getClipboardEntriesRye Mutt
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-07-22Fix nullptr crash in LLInvFVBridge::getClipboardEntriesRye Mutt
2024-07-21Fix rare shutdown crash in gCacheNameRye Mutt
2024-07-17viewer-private#251 Fixed state of folder creation in marketplaceAndrey Kleshchev
2024-06-27Merge pull request #1840 from secondlife/inventory_favoritesAndrey Kleshchev
viewer#1300 viewer#1301 viewer#1424 viewer#1425 viewer#1619 viewer#1005
2024-06-14jira-archive-internal#63268 Several objects are worn on the same partAndrey Kleshchev
of the body by double-clicking on the object from the "Library" folder SL-13411
2024-06-10Merge main into inventory_favoritesAndrey Kleshchev
# Conflicts: # indra/llui/llfolderviewmodel.h # indra/newview/llpanelwearing.cpp # indra/newview/llwearableitemslist.cpp
2024-06-10Re-enable compiler warnings C4018, C4100, C4231 and C4506Ansariel