summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
AgeCommit message (Collapse)Author
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-02-02Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
2023-02-01SL-19104 update label and permissions displayMaxim Nikolenko
2023-02-01SL-19117 Textures should return asset id when thumbnail is not setAndrey Kleshchev
2023-02-01SL-19117 Extend texture preview to show thumbnails when presentAndrey Kleshchev
2023-02-01Add a texture inspector and show it when hovering over an inventory textory ↵Kitty Barnett
(or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
2022-12-08SL-18807 FIXED Viewer crashes when trying to purge item using 'Pick: Select ↵Maxim Nikolenko
settings' floater
2022-10-19Reduce folderview menu bloat via lazy creation on right clickRye Mutt
2022-09-15SL-18161 Properly list pbr material folderAndrey Kleshchev
2022-09-15SL-18161 Add PBR materials to Uploads in preferencesAndrey Kleshchev
2022-08-17SL-17699 Multiple asset types support for LLAssetFilteredInventoryPanelAndrey Kleshchev
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorypanel.cpp
2021-06-25Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-09SL-13182 Fix root folder's stateAndrey Kleshchev
2021-04-07SL-13182 Fix root folder's stateAndrey Kleshchev
2021-04-02SL-13182 Expanded buildNewViews with build modesAndrey Kleshchev
2021-04-01SL-13182 Split buildNewViews over framesAndrey Kleshchev
2021-02-23SL-12475 Add the way to reset current Favorites foldersMnikolenko Productengine
2021-02-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-02-01Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
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-12-07SL-1777 FIXED Uploading Image or Saving Snapshot while in Inventory Recent ↵Mnikolenko Productengine
tab jumps to Main tab
2020-11-23SL-14370 Don't init inventory views if they aren't neededAndrey Kleshchev
These views are 'heavy' and rarely used, don't init them all the time.
2020-11-13Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-04SL-13826 Open a new inventory floater for "Find original" and "Show ↵Mnikolenko Productengine
original" result
2020-10-22SL-14161 FIXED an item persists in inventory after dragging it to the ↵Mnikolenko Productengine
marketplace listings
2020-09-28Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterbuycurrency.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.h # indra/newview/skins/default/xui/en/floater_buy_currency.xml
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-05-05SL-13178 Improve initial opening time of the landmarks floaterMnikolenko Productengine
2020-05-05SL-13178 Improve initial opening time of the landmarks floaterMnikolenko 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-28SL-13119 Optimize initialization of inventory viewsAndrey Kleshchev
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-27SL-12475 add Inventory Favorites tabmaxim_productengine
2019-08-15SL-209 Cleanup Merchant Outboxandreykproductengine
2019-05-08Fix merge fail.Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
2019-02-05SL-10470 Fixed freeze due to extensive loggingandreykproductengine
2019-02-08SL-10509 EEP Settings Picker gets closed by drag&dropandreykproductengine
2018-12-21SL-10275 FIXED [EEP] Pressing Enter while setting "Settings From Inventory" ↵maxim_productengine
opens the Day Cycle
2018-12-13MergeRider Linden
2018-11-09SL-10018 FIXED Viewer crashes when clicking on a link of a folder in Inventorymaxim_productengine
2018-11-05SL-1386 Fix for onSelectionChange crashandreykproductengine
2018-10-12SL-9733 Implemented drag and drop support for presorted panelandreykproductengine