summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-10-12SL-14078 Small optimizationAndrey Kleshchev
2020-10-12SL-14078 Maked couple functions as constAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-09Revert "SL-12475 add Inventory Favorites tab"Andrey Lihatskiy
This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f. # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h
2020-06-15SL-13457 FIXED Crash in LLFolderViewGroupedItemBridge::canWearSelectedMnikolenko Productengine
2020-05-28SL-13239 Add 'Touch' to the various attachment context menusMnikolenko Productengine
2020-05-22SL-13190 Allow Edit Attached Object Position From InventoryMnikolenko Productengine
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-04-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-02-21Merge master (v 6.3.8) into DRTVWR-440Dave Houlton
2020-01-27SL-12475 add Inventory Favorites tabmaxim_productengine
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-10-23SL-12180 Crash on requestOfflineMessagesCoroandreykproductengine
2019-10-16mergeBrad Payne (Vir Linden)
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-10-17Line endings fixAndreyL ProductEngine
2019-10-17SL-12121 FIXED Unable to delete folders from 'Marketplace listings'Mnikolenko Productengine
2019-08-26SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.Rider Linden
2019-07-24SL-11645 Replacing outfit from an object leaves one item unwornandreykproductengine
2019-06-14SL-11361 Moving folder to My Outfits should create an outfitandreykproductengine
2019-05-31SL-11324 FIXED Accidental deletion of Marketplace Listings folder possiblemaxim_productengine
2019-05-08Fix merge fail.Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
2019-04-26Merged SL-10400 and SL-10401AndreyL ProductEngine
2019-04-23SL-10401 - get agent attachment limit from SimulatorFeatures if availableBrad Payne (Vir Linden)
2019-02-05SL-10470 Fixed freeze due to extensive loggingandreykproductengine
2019-02-20SL-9660: Next pass cleanup. Removed and downgraded a number of logs. ↵Rider Linden
Removed refs to LAPAS. Better sync with legacy regions.
2019-01-11SL-10350: If the item is now owned by the current user assume it is in the ↵Rider Linden
libary. Don't let them edit.
2019-01-10SL-10279 Finalize drag and drop supportandreykproductengine
2018-12-13MergeRider Linden
2018-12-13SL-10236 The "Attach To", "Attach To HUD", and "Wear" options aren't greyed outandreykproductengine
2018-11-30SL-9716 [EEP] "Use Shared Environment" does not enable when applying an ↵maxim_productengine
environment to a parcel or region
2018-11-28SL-9787 EEP Remove Apply to Region from right-click menus.andreykproductengine
2018-11-02SL-9886: Viewer send and receive new day_name(s) information in the ↵Rider Linden
environment protocol for viewer specified names on individual tracks.
2018-11-02SL-979 Don't allow DnD or paste folders to “Lost and Found”maxim_productengine
2018-09-26MergeRider Linden
2018-09-19SL-9665 FIXED [EEP] "Rename" greyed out for assets in My Environmentsmaxim_productengine
2018-09-13SL-984 Disable creating EEP settings under Lost and Found foldermaxim_productengine
2018-08-28MAINT-8910 FIXED EEP - clicking at settings embedded into notecard does nothingmaxim_productengine
2018-08-17MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for environment ↵Rider Linden
pannels in Region/Estate and Parcel. Enable/disable by permission. Edit the correct environment. Dirty flags for changes. Estate owner disallow switch.
2019-04-26Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-04-22SL-8012 Remove Mesh Filter Option on Inventoryandreykproductengine
2019-04-03SL-10510 Revertandreykproductengine
2019-04-02SL-10510 Allow copy of worn itemsandreykproductengine
2019-03-04SL-10652 FIXED Crash in LLFolderViewGroupedItemBridge::canWearSelectedmaxim_productengine
2018-08-01MAINT-8803 Better UI handling of unrecognized inventory itemsmaxim_productengine
2018-07-10MAINT-8821: Tighten up floater. Allow apply from gear menu.Rider Linden
2018-06-21MergeRider Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 13:53:29 +0000