summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-02SL-14075 allow exporting multiple textures with the same nameMnikolenko Productengine
2021-06-25Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-21Revert "SL-14633 FIXED The item from the favorite tab in the inventory ↵Mnikolenko Productengine
floater can be purged"
2021-04-16SL-13395 Allow creating outfit folders under My OutfitsAndrey Kleshchev
2021-02-25SL-14654 [EEP] Aplying settings locally now is instantAndrey Kleshchev
The 1 second fade makes it harder to compare different settings.
2021-02-23SL-12475 Add the way to reset current Favorites foldersMnikolenko Productengine
2021-02-19SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5Andrey Kleshchev
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2021-02-01Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-01-06SL-14633 FIXED The item from the favorite tab in the inventory floater can ↵Mnikolenko Productengine
be purged
2020-12-10SL-13826 Show result of "Find original" and "Show original" in Main ↵Mnikolenko Productengine
Inventory floater and reset the filters to guarantee success
2020-11-13Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
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-11-10SL-14303 Fix LLWearableType to not spam in logsAndrey Kleshchev
2020-11-04SL-13826 Open a new inventory floater for "Find original" and "Show ↵Mnikolenko Productengine
original" result
2020-11-02SL-14075 Allow bulk download of textures/picturesMnikolenko Productengine
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-09-09SL-12475 add Inventory Favorites tabmaxim_productengine
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 21:46:55 +0000