summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewmodelinventory.cpp
AgeCommit message (Collapse)Author
2025-04-18#3910 Fix sorting of 'favorites' inventory tabAndrey Kleshchev
2025-04-10Fix merge issues:Ansariel
* Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp * Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors # Conflicts: # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llui/llfolderviewitem.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llvoavatar.cpp
2024-06-10Merge main into inventory_favoritesAndrey Kleshchev
# Conflicts: # indra/llui/llfolderviewmodel.h # indra/newview/llpanelwearing.cpp # indra/newview/llwearableitemslist.cpp
2024-04-29viewer#1300 'Star' favorites in inventory #3Andrey Kleshchev
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-27viewer#1300 'Star' favorites in inventoryAndrey Kleshchev
image is WIP
2023-01-16SL-18735 Using "Find original" in main inventory tab breaks inventory viewAndrey Kleshchev
Fixes folders being invidible (missing arrange) Fixes sroll to target not working reliably
2021-04-03SL-13182 Fix excessive resorting #2Andrey Kleshchev
Don't resort whole branch of inventory if created(loaded) item is not newer. Should also stabilize fetch phase a bit.
2021-04-02SL-13182 Fix excessive resortingAndrey Kleshchev
2021-04-01SL-13182 Split buildNewViews over framesAndrey Kleshchev
2018-11-06SL-10013 Crash in LLFolderViewModelItemInventory::filterChildItem(..)maxim_productengine
2017-10-20MAINT-7906 Inventory filter fixMnikolenko Productengine
2017-08-29MAINT-7625 Fixed wrong warning when deleting an empty folderAndreyL ProductEngine
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-08-04Merge downstream code and become version 3.8.3andreykproductengine
2015-06-22MAINT-5274 Missing folder arrowandreykproductengine
2015-04-13DD-388 : More resilient way of reacting to not evaluated stock count ↵Merov Linden
throughout marketplace handling
2014-12-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-09-28Pull merge from lindenlab/viewer-releaseMerov Linden
2014-08-21fixing merge conflictsandreykproductengine
2014-08-21Merge downstream code into viewer-lion and become version 3.7.15simon
2014-08-12MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder ↵andreykproductengine
and hides THAT folder
2014-07-29MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters" not working correctlyandreykproductengine
reverted and remade MAINT-4218
2014-07-29MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters" not working correctlyandreykproductengine
2014-07-14MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder ↵andreykproductengine
and hides THAT folder
2014-05-31DD-92 : Clear llinfos compilation warning and similarMerov Linden
2014-05-30Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-22MergeXiaohong Bao
2014-04-10DD-16 : Implement sort by stock count in merketplaceMerov Linden
2013-11-19SH-4634 FIX Interesting: Viewer crashes when receiving teleport offerRichard Linden
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
2013-11-15MAINT-3320 : Fixed! Inventory panels are not resistant to folder root ↵Merov Linden
deletion, using handle instead of pointer and cleaning things consistently
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-04-22CHUI-912 : Fixed! Filtering with types do work correctly again (including None).Merov Linden
2013-04-19CHUI-912 : Some clean up of vestigial debug codeMerov Linden
2013-04-19CHUI-849 : Use a time limit for filtering instead of number limit, use a ↵Merov Linden
different limit for visible and unvisible lists
2013-04-18CHUI-849 : WIP : Filter limit on time instead of number of itemsMerov Linden
2013-04-16CHUI-912, CHUI-849 : Propagate arrange request correctly, limit sort, ↵Merov Linden
improve filter perf, clear traces, add comments.
2013-04-15CHUI-912 : WIP : Try to change the return value of filter() so to trigger ↵Merov Linden
arrange on the fly.
2013-04-08CHUI-912 : WIP : Add traces to various aspects of the inventory filtering, ↵Merov Linden
sorting and arranging (to be deleted)
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-01-07CHUI-659 : WIP : Clamp down on the number of rearrange we really need.Merov Linden
2013-01-07CHUI-659 : WIP : Clean up typos in my own commentsMerov Linden
2013-01-07CHUI-659 : WIP : Reimplemented favorite landmark sorting to follow favorites ↵Merov Linden
bar index sorting.
2012-08-01CHUI-223 WIP Selecting to cut an inventory item causes all open inventory ↵Richard Linden
windows to refresh improved filtering behavior that should result in less flashes of emptiness
2012-08-01merge with ssh://hg.lindenlab.com/richard/viewer-chuiRichard Linden
2012-08-01CHUI-267 FIX Full inventory listing not always shown for test accountRichard Linden
changed LLFolderViewModelInterface::getFilter() to return a reference, since it is never NULL removed sort order from filter, which was causing unneeded filtering
2012-07-31CHUI-254 : Fix Inventory filter and item draw() to highlight matching ↵Merov Linden
substrings in inventory
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-14 11:34:09 +0000