summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.h
AgeCommit message (Collapse)Author
2024-05-15Merge branch 'main' into release/luau-scripting for Maint X release.Nat Goodspeed
2024-05-15Manual whitespace fixes (fix_whitespace.py).Nat Goodspeed
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-04-16Merge branch 'main' into release/luau-scriptingNat Goodspeed
2024-04-12Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
# Conflicts: # indra/llimage/llimageworker.cpp # indra/llimage/llimageworker.h # indra/newview/llcontrolavatar.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/lltexturefetch.cpp
2024-04-03Merge branch 'main' into release/luau-scripting.Nat Goodspeed
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-03-27Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml
2024-01-10SL-19555 Fix picker failing to highlight default material in inventoryAndrey Kleshchev
2023-11-13SL-20575 Fix some deletion issuesAndrey Kleshchev
- Fixes 'cut' checks for gallery - Checking if large folder is deletable should be faster now - For large flat root folders eliminated delay of looking for cof Might be a good idea to start cashing isItemRemovable if category version hasn't changed.
2023-10-17SL-20232 Allow deletion of folders with worn content in tree view #3Andrey Kleshchev
2023-10-17SL-20232 Allow deletion of worn items #1Andrey Kleshchev
2023-10-03DRTVWR-589: Merge branch 'main' of viewer-private into DRTVWR-589Nat Goodspeed
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-20DRTVWR-589 - added play animation and started to collect demo scriptsBrad Payne (Vir Linden)
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-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-04-12SL-19036: Extra folder is created after dragging the inventory folderAlexander Gavriliuk
2023-03-30SL-19379 WIP update gear menu with Gallery itemsMaxim Nikolenko
2023-03-29SL-19379 WIP allow change search type for GalleryMaxim Nikolenko
2023-03-29SL-19379 WIP add basic context menuMaxim Nikolenko
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-10SL-18629 Replacing UDP creation messages with callback based AISAndrey Kleshchev
2022-10-06SL-18297 A freeze while checking marketplace for errorsAndrey Kleshchev
2022-07-04SL-17665 Add operation to create a subfolder from selected items in InventoryMnikolenko Productengine
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-06-25Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-05-17SL-15223 FIXED "Reason: 'Not Found'" error message floater is shown when ↵Mnikolenko Productengine
delete the unlisted listing folder
2021-03-30SL-15036 Add actions to move landmarks between tabs in the Places floaterMnikolenko Productengine
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
2020-11-02SL-14075 Allow bulk download of textures/picturesMnikolenko Productengine
2020-05-22SL-13190 Allow Edit Attached Object Position From InventoryMnikolenko Productengine
2018-05-22MAINT-8553 FIXED link is not copied from original folder in some casesmaxim_productengine
2017-05-30MAINT-7356 Feature - Force item delete warning to prompt once per sessionpavelkproductengine
2016-04-04merge with 4.0.3-releaseOz 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-08-18Merge downstream code and become version 3.8.4andreykproductengine
2015-08-04merge conflict fixandreykproductengine
2015-08-04merge conflict fixandreykproductengine
2015-08-04Merge downstream code and become version 3.8.3andreykproductengine