summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.cpp
AgeCommit message (Collapse)Author
2024-04-24Merge branch 'main' into marchcat/a-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llimage/llimage.cpp # indra/llui/llsearcheditor.cpp # indra/llui/llview.cpp # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloatercamera.cpp # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelgroupbulkban.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llvovolume.cpp
2024-04-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # indra/llcommon/llapp.cpp # indra/llcommon/llapp.h # indra/llimage/llimageworker.cpp # indra/llui/llcontainerview.cpp # indra/llui/llcontainerview.h # indra/llui/llkeywords.cpp # indra/llui/lltabcontainer.cpp # indra/llui/lltextbase.cpp # indra/newview/llappviewer.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfavoritesbar.h # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llhudnametag.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelvoicedevicesettings.h # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llselectmgr.cpp # indra/newview/lltranslate.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewermessage.cpp
2024-04-10Merge branch 'main' into marchcat/y-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp
2024-03-27Merge branch 'main' into marchcat/yz-mergeAndrey Lihatskiy
2024-03-27Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llfloaterchangeitemthumbnail.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llselectmgr.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llvovolume.cpp
2024-03-27Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-02-20jira-archive-internal#71115 Add Images to Objects in BulkAndrey Kleshchev
SL-20725
2024-02-12miscellaneous: BOOL (int) to real boolLars Næsbye Christensen
2024-02-05Merge branch 'DRTVWR-599-maint-Z' into release/maint-yzAndrey Lihatskiy
# Conflicts: # indra/newview/llchiclet.h
2024-01-10SL-19555 Fix picker failing to highlight default material in inventoryAndrey Kleshchev
2024-01-09Replace BOOST_FOREACH with standard C++ range-based for-loopsAnsariel
2023-12-14SL-20729 Crash in getObjectAndrey Kleshchev
in "new_folder_from_selected" at gInventory.getObject(*ids.begin()); according to bugsplat argument id was a null pointer so I assume there was an issue geting id out of the list.
2023-11-17SL-20607 Version folder was not created when copying folders to marketplaceAndrey Kleshchev
2023-10-03Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/llui/lltooltip.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/textures/textures.xml
2023-09-10SL-19826 Gallery multiselect support Part#3Andrey Kleshchev
wip
2023-08-23Merge branch main (DRTVWR-582) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2023-08-01SL-19982 Adjustable font size in LSL editorMnikolenko Productengine
2023-06-30SL-19938 Make sure marketplace removes empty folder it automatically moved ↵Andrey Kleshchev
items from when folder was recreated into stock fodler
2023-06-29SL-19932 FIXED Drag and drop or paste of new item in existing marketplace ↵Maxim Nikolenko
entry does not work
2023-06-09SL-19826 Pasting folders in Single folder should highlight pasted folderAndrey Kleshchev
2023-06-08SL-19845 show delete confirmation at least once per sessionMaxim Nikolenko
2023-05-30SL-19773 add context menu for root folder in single folder modeMaxim Nikolenko
2023-04-12SL-19036: Extra folder is created after dragging the inventory folderAlexander Gavriliuk
2023-04-08SL-19529 Marketplace validation improvementsAndrey Kleshchev
2023-04-08SL-19529 Fix uninitialized variable and calback counterAndrey Kleshchev
2023-04-06SL-19529 MacOS build fixAndrey Kleshchev
2023-04-06SL-19529 Marketplace version folders not createdAndrey Kleshchev
2023-03-30SL-19379 WIP update gear menu with Gallery itemsMaxim Nikolenko
2023-03-30Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-29SL-19379 WIP allow change search type for GalleryMaxim Nikolenko
2023-03-29SL-19379 WIP add basic context menuMaxim Nikolenko
2023-03-29SL-19502 Copying folders should copy thumbnailsAndrey Kleshchev
2023-03-24SL-19379 WIP show localized folder names in GalleryMaxim Nikolenko
2023-03-22SL-19379 WIP basic drag and drop handlingMaxim Nikolenko
2023-03-21SL-19379 WIP Gallery view Inventory: first passMaxim Nikolenko
2023-03-20SL-18629 Load cof only once links are readyAndrey Kleshchev
2023-03-11mac build fixMaxim Nikolenko
2023-03-10SL-18629 Replacing UDP creation messages with callback based AISAndrey Kleshchev
2023-03-10SL-18629 WIP Replacing UDP creation messages with callback based AIS #2Andrey Kleshchev
findCategory and move_item_to_marketplacelistings
2023-03-10SL-18629 WIP Replacing UDP creation messages with callback based AISAndrey Kleshchev
2023-03-10SL-19335 Switching view (using the switch button) should select appropriate ↵Maxim Nikolenko
folder
2023-02-24SL-19234 add Inventory settings floaterMaxim Nikolenko
2023-02-14SL-19140 Fix contribution docAndrey Kleshchev
2023-02-14Add multi item properties floater supportAnsariel
2023-02-08SL-19134 Remove llfloaterpropertiesAndrey Kleshchev
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
2023-02-03SL-19109 Decouple object profiles from inventoryAndrey Kleshchev
Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
2023-02-03Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llappearancemgr.cpp # indra/newview/llpanelmaininventory.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 07:21:59 +0000