summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
AgeCommit message (Collapse)Author
2023-07-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp
2023-05-18SL-19649 Adjust other classes for new deleteAllChildren mechanicsAndrey Kleshchev
2023-04-12SL-19036: Extra folder is created after dragging the inventory folderAlexander Gavriliuk
2023-04-07Merge branch 'main' into marchcat/main-contrib-mergeAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/tests/llleap_test.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/en/strings.xml
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-02-07Added a digest_t typedef to clarify the usage of the digest LLUUIDHenri Beauchamp
As suggested in comments for previous commit.
2023-02-06Faster and simpler inventory category hashing.Henri Beauchamp
This commit changes inventory category hashing from slow LLMD5 to fast HBXX128 hashing, and allows to use a simple LLUUID for the hash, instead of an LLMD5 instance. It also removes some old cruft dealing with unused baked texture hashing.
2023-02-02Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
2023-01-20SL-14318 MacOS __write_nocancel crashAndrey Kleshchev
Multiple instances of viewer could write to the same uuid.inv file at the same time.
2023-01-12Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llagent.cpp # indra/newview/llimview.cpp # indra/newview/llimview.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmediasettingsgeneral.cpp # indra/newview/pipeline.cpp
2022-12-12Merge branch 'main' into DRTVWR-568Callum Prentice
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-03SL-18492 Switch inventory script compiler default from LSO to monoMnikolenko Productengine
2022-10-28SL-16534 The link item is not updating after rezzing the linked object in-worldMnikolenko Productengine
2022-10-27DRTVWR-570 Mac build fix: unused variables cleanupAndrey Lihatskiy
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-19Fix use after free in inventory object deletionRye Mutt
2022-10-06SL-18297 A freeze while checking marketplace for errorsAndrey Kleshchev
2022-09-15Merge branch 'master' into DRTVWR-568Callum Linden
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-24DRTVWR-558: Eliminate many spurious set-not-used variables.Nat Goodspeed
With Xcode 13.4, these unused variables break Release builds.
2022-08-17SL-17834 MP window freezes when loading items from InventoryAndrey Kleshchev
1. Do not process all marketpalce changes at once, schedule them for later 2. Do not notifyObservers from notifyObservers
2022-06-21SL-17635 remove unused variablesMaxim Nikolenko
2022-05-12Merge remote-tracking branch 'origin/SL-17243' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-12SL-17243 - moved inventory warnings to a mapBrad Payne (Vir Linden)
2022-05-11SL-17243 - ViewerStats includes details on warning conditions in inventory, ↵Brad Payne (Vir Linden)
if any are encountered.
2022-04-18Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-03-18SL-16984 Dupplicated FT_SETTINGS shouldn't prevent inventory from loadingAndrey Kleshchev
2022-03-10SL-16984 Loop tracking and loggingAndrey Kleshchev
2022-03-08SL-16984 Fixed inventory loop freezing viewerAndrey Kleshchev
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-01-28SL-16715 - viewerstats, added more detail about failure cases in inventoryBrad Payne (Vir Linden)
2022-01-21SL-1159 Fix inbox consolidation failureAndrey Kleshchev
2021-12-13SL-16497 Fix inventory update recursionAndrey Kleshchev
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
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-01SL-13934 Crash at saveToFile #2Andrey Kleshchev
More detailed stream handling and logging
2021-09-29SL-13934 Crash at saveToFileAndrey Kleshchev
2021-08-06SL-15778 Crash at getPreferredType() in findCategoryUUIDForTypeInRootAndrey Kleshchev
2021-08-02SL-15711 Viewer hangs with agents with malformed inventoryAndrey Kleshchev
2021-07-27SL-15681 FIXED Crash occurs at first log in of a new userMnikolenko Productengine
2021-01-26SL-14570 - inventory validation info to ViewerStats, added QA mode setting ↵Brad Payne (Vir Linden)
to exercise failure cases
2021-01-14SL-14580 Fixed warnig levelAndrey Kleshchev
2021-01-13SL-14580 Be a bit more forgiving about addChangedMask calls nested in ↵Andrey Kleshchev
notifyObservers
2021-01-13SL-14580 Notify observers warnings with new accountsAndrey Kleshchev
2020-12-18SL-14570 - error messages, avoid a couple of warnings caused by attempts to ↵Brad Payne (Vir Linden)
create folders before inventory is loaded