livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,633 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

56 Commits (1002a28e39d0eb03ae12b1da365a2e05bf661c56)

Author SHA1 Message Date
Andrey Kleshchev f5be549370 #3910 Fix sorting of 'favorites' inventory tab 2025-04-18 22:23:14 +03:00
Ansariel 19347f7094 Fix merge issues: 
* Restore changes from 21947778ba to llwindow/llwindowwin32.cpp
* Restore changes from 3758618949 to newview/llinspecttexture.cpp
* Fix apparent merge error in LLInventoryPanel::itemChanged
* Restore changes from 1eeecfa1a8 in newview/llpaneloutfitsinventory.h
* Restore changes from b9633c17e3 in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp
* Restore changes from f660f1f0fd in newview/llviewertexture.cpp
* Restore changes from b9633c17e3 & 98f7d73d46 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp
* Replace changes from 23729442aa 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
 2025-04-10 23:51:36 +03:00
Andrey Kleshchev 0dcc912cec Merge main into inventory_favorites 
# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp
 2024-06-10 19:25:02 +03:00
Andrey Kleshchev 2add3b4953 viewer#1300 'Star' favorites in inventory #3 2024-04-29 22:43:24 +03:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Andrey Kleshchev cea6eeeede viewer#1300 'Star' favorites in inventory 
image is WIP
 2024-04-27 00:39:50 +03:00
Andrey Kleshchev a1931d8cc4 SL-18735 Using "Find original" in main inventory tab breaks inventory view 
Fixes folders being invidible (missing arrange)
Fixes sroll to target not working reliably
 2023-01-16 20:42:20 +02:00
Andrey Kleshchev 2be5baf70d SL-13182 Fix excessive resorting #2 
Don't resort whole branch of inventory if created(loaded) item is not newer. Should also stabilize fetch phase a bit.
 2021-04-03 00:15:44 +03:00
Andrey Kleshchev 820ac72f8c SL-13182 Fix excessive resorting 2021-04-02 23:36:14 +03:00
Andrey Kleshchev 7ddbf118f5 SL-13182 Split buildNewViews over frames 2021-04-01 23:06:44 +03:00
maxim_productengine 2f12e96e61 SL-10013 Crash in LLFolderViewModelItemInventory::filterChildItem(..) 2018-11-06 17:14:36 +02:00
Mnikolenko Productengine 628e28639d MAINT-7906 Inventory filter fix 2017-10-20 15:41:38 +03:00
AndreyL ProductEngine 8ed869a22e MAINT-7625 Fixed wrong warning when deleting an empty folder 2017-08-29 01:52:14 +03:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
andreykproductengine f94a19e09e Merge downstream code and become version 3.8.3 2015-08-04 16:45:49 +03:00
andreykproductengine 7cd62f4908 MAINT-5274 Missing folder arrow 2015-06-22 19:26:28 +03:00
Merov Linden 637e096d57 DD-388 : More resilient way of reacting to not evaluated stock count throughout marketplace handling 2015-04-13 15:29:56 -07:00
Merov Linden b0f590f6ab Pull merge from lindenlab/viewer-release 2014-12-19 06:00:48 -08:00
Merov Linden 4b80a5ed05 Pull merge from lindenlab/viewer-release 2014-09-28 21:40:32 -07:00
andreykproductengine 23e2dcce9d fixing merge conflicts 2014-08-21 20:59:48 +03:00
simon 95a14433b8 Merge downstream code into viewer-lion and become version 3.7.15 2014-08-21 09:11:11 -07:00
andreykproductengine a14ba78dbb MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder and hides THAT folder 2014-08-12 19:45:53 +03:00
andreykproductengine 0ea34fba73 MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters" not working correctly 
reverted and remade MAINT-4218
 2014-07-29 17:55:06 +03:00
andreykproductengine 7d8b90ce98 MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters" not working correctly 2014-07-29 17:55:06 +03:00
andreykproductengine 30c73d0f25 MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder and hides THAT folder 2014-07-14 12:28:29 +03:00
Merov Linden fd426bafb6 DD-92 : Clear llinfos compilation warning and similar 2014-05-31 19:19:20 -07:00
Merov Linden 68b62747ed Pull merge from lindenlab/viewer-release 2014-05-30 14:19:53 -07:00
Xiaohong Bao ae564140c0 Merge 2014-04-22 12:19:28 -06:00
Merov Linden 253781f87c DD-16 : Implement sort by stock count in merketplace 2014-04-10 18:55:07 -07:00
Richard Linden 391ac367d6 SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer 
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
 2013-11-19 17:40:44 -08:00
Merov Linden 6ec99570cd MAINT-3320 : Fixed! Inventory panels are not resistant to folder root deletion, using handle instead of pointer and cleaning things consistently 2013-11-15 15:12:11 -08:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro 
another attempt to move mem stat into base class
 2013-09-05 14:04:13 -07:00
Merov Linden 2113bb8159 Pull merge from viewer-release 2013-05-22 11:23:51 -07:00
Merov Linden 022dd12460 CHUI-912 : Fixed! Filtering with types do work correctly again (including None). 2013-04-22 15:51:15 -07:00
Merov Linden f59af8d27c CHUI-912 : Some clean up of vestigial debug code 2013-04-19 19:02:21 -07:00
Merov Linden 2cc1fb250f CHUI-849 : Use a time limit for filtering instead of number limit, use a different limit for visible and unvisible lists 2013-04-19 16:51:44 -07:00
Merov Linden 03ad10d258 CHUI-849 : WIP : Filter limit on time instead of number of items 2013-04-18 19:46:08 -07:00
Merov Linden e84c97e86d CHUI-912, CHUI-849 : Propagate arrange request correctly, limit sort, improve filter perf, clear traces, add comments. 2013-04-16 19:24:47 -07:00
Merov Linden 0ecbbe9571 CHUI-912 : WIP : Try to change the return value of filter() so to trigger arrange on the fly. 2013-04-15 11:16:57 -07:00
Merov Linden d533a33f42 CHUI-912 : WIP : Add traces to various aspects of the inventory filtering, sorting and arranging (to be deleted) 2013-04-08 18:59:21 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden d71c0ab32c CHUI-659 : WIP : Clamp down on the number of rearrange we really need. 2013-01-07 18:30:59 -08:00
Merov Linden 51d6589eed CHUI-659 : WIP : Clean up typos in my own comments 2013-01-07 18:02:28 -08:00
Merov Linden d68f4ff646 CHUI-659 : WIP : Reimplemented favorite landmark sorting to follow favorites bar index sorting. 2013-01-07 17:42:11 -08:00
Richard Linden c009cf4f76 CHUI-223 WIP Selecting to cut an inventory item causes all open inventory windows to refresh 
improved filtering behavior that should result in less flashes of emptiness
 2012-08-01 19:42:22 -07:00
Richard Linden 997812c7b0 merge with ssh://hg.lindenlab.com/richard/viewer-chui 2012-08-01 01:27:38 -07:00
Richard Linden a204059d2e CHUI-267 FIX Full inventory listing not always shown for test account 
changed LLFolderViewModelInterface::getFilter() to return a reference, since it is never NULL
removed sort order from filter, which was causing unneeded filtering
 2012-08-01 01:14:27 -07:00
Merov Linden e9a484f98d CHUI-254 : Fix Inventory filter and item draw() to highlight matching substrings in inventory 2012-07-31 23:46:13 -07:00