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

103 Commits (efcf81eb4a95cd45027c1470e955ea9ccbe69c58)

Author SHA1 Message Date
Ansariel efcf81eb4a Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/sidepanel_inventory.xml
 2023-06-26 23:25:05 +02:00
Maxim Nikolenko 7e0dceca68 SL-19898 FIXED Contents purchased from items do not show in Recent Items until selecting folder 2023-06-21 18:38:10 +03:00
Ansariel 6273fb827f Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.h
 2023-05-31 12:02:06 +02:00
Andrey Kleshchev b9fad316a3 SL-17429 Message user when their inventory hits AIS2 limits 2023-05-29 23:37:58 +03:00
Andrey Kleshchev 352ca2f881 SL-19652 Folder fetch dupplicate protection and over limit handling 2023-05-29 23:10:15 +03:00
Ansariel f156461048 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llaisapi.cpp
#	indra/newview/llaisapi.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llstartup.cpp
#	indra/newview/llviewerinventory.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
 2023-05-03 13:00:22 +02:00
Andrey Kleshchev 03c263a1cd SL-19533 Fix 'fetching' state timeout 2023-04-28 23:41:25 +03:00
Andrey Kleshchev 9349a9b5d4 SL-19533 More children per subset fetch request 2023-04-28 00:18:46 +03:00
Andrey Kleshchev 377f177a86 SL-19533 Removed per-run limit 
Doesn't seem to work like expected and I never get more than 7-9 requests running total
 2023-04-27 21:32:17 +03:00
Andrey Kleshchev 7bb5644969 SL-19533 Subset fetch fixes 2023-04-27 20:23:19 +03:00
Andrey Kleshchev 697d3be3c9 SL-19533 Implement subset variant of children request 2023-04-27 01:30:57 +03:00
Andrey Kleshchev c008d3e030 SL-19533 Reduce inventory fetch stalls 2023-04-25 12:27:44 +03:00
Andrey Kleshchev 154ab03bf8 SL-19533 Special COF handling #2 2023-04-25 04:26:38 +03:00
Andrey Kleshchev 9c2b0c709b SL-19533 Special COF handling 2023-04-25 01:34:35 +03:00
Ansariel 7bcb251661 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/llui/lllayoutstack.h
#	indra/newview/llfloatersidepanelcontainer.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llinventoryfilter.h
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorymodelbackgroundfetch.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
 2023-04-21 12:08:40 +02:00
Andrey Kleshchev 97b0f637df SL-19533 Check descendants even for a recursive fetch 2023-04-19 00:20:27 +03:00
Andrey Kleshchev 53f2e1710a SL-19533 Faster declouding 2023-04-13 02:20:42 +03:00
Andrey Kleshchev 8b1a7085be SL-19533 Logging tag change 2023-04-12 19:13:41 +03:00
Andrey Kleshchev 1f2cbfdbe2 SL-19533 Content should be recursive only 2023-04-12 00:53:48 +03:00
Andrey Kleshchev 627c4e45ba SL-19533 Track folder fetch requests in bulk fetch 2023-04-12 00:39:48 +03:00
Andrey Kleshchev 5e59ab0ab7 SL-19533 Further logging improvements 2023-04-12 00:39:48 +03:00
Andrey Kleshchev 8171224a65 SL-19533 Don't fetch items if recursive fetch isn't done 2023-04-11 19:26:21 +03:00
Andrey Kleshchev 69e3b5fb40 SL-19533 Orphans plus additional logging 2023-04-11 01:58:28 +03:00
Andrey Kleshchev 43ff8108f2 SL-19534 Better fetch failure handling 2023-04-07 20:12:22 +03:00
Ansariel 49c8ce2b07 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
 2023-03-30 14:53:12 +02:00
Maxim Nikolenko 198cd4df09 Merge branch 'main' into DRTVWR-567 
# Conflicts:
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
 2023-03-30 14:09:50 +03:00
Ansariel 49e7302d08 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llavataractions.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
 2023-03-30 11:00:08 +02:00
Andrey Kleshchev 3bf9c78f56 SL-18003 Improve dupplicate prevention 
Try getting lost and found
 2023-03-28 21:37:32 +03:00
Ansariel 04de81c710 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llaisapi.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.h
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/skins/default/xui/de/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/es/panel_main_inventory.xml
#	indra/newview/skins/default/xui/fr/panel_main_inventory.xml
#	indra/newview/skins/default/xui/ja/panel_main_inventory.xml
 2023-03-28 17:59:22 +02:00
Andrey Kleshchev d21a1aace6 SL-18003 Missed pool name 2023-03-28 03:42:23 +03:00
Andrey Kleshchev 89a8c96f36 SL-18003 Bulk download items when possible 
And signal fodler fetch completion when folder of recursive fetch is done, do not hold it for individual items
 2023-03-28 02:27:34 +03:00
Andrey Kleshchev 110ed8f4d3 SL-18003 Don't cause excessive full rebuild 2023-03-28 00:53:35 +03:00
Andrey Kleshchev 0eff975649 SL-18003 Basic dupplicate prevention 2023-03-27 21:27:50 +03:00
Andrey Kleshchev b00e2da9e2 SL-18003 Faster cof fetching 2023-03-27 21:04:51 +03:00
Andrey Kleshchev 6fd7427c57 SL-18003 Bulk fetch some items by fetching whole folder 2023-03-26 13:44:50 +03:00
Andrey Kleshchev c9d9f1c54e SL-18003 Make ais fetch faster 2023-03-24 18:52:15 +02:00
Ansariel 2180c2a443 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llaisapi.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorymodel.h
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorymodelbackgroundfetch.h
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
 2023-03-20 18:15:38 +01:00
Andrey Kleshchev 72131418aa SL-18629 Rebuild brocken link on fetch compeltion. 2023-03-19 16:11:21 +02:00
Andrey Kleshchev 70d99cde58 SL-18629 Track request depth to be able to distinguish incomplete folder reliably 2023-03-18 00:31:09 +02:00
Andrey Kleshchev 3a5c41a20e SL-18629 Fetch Inventory using AIS caps #4 2023-03-17 03:48:45 +02:00
Andrey Kleshchev 7a70d93c43 SL-18629 Fetch Inventory using AIS caps #3 2023-03-15 20:18:38 +02:00
Andrey Kleshchev 83811ff846 SL-18629 WIP Fetch Inventory using AIS caps #2 2023-03-15 20:18:38 +02:00
Andrey Kleshchev ac145cb21f SL-18629 WIP Fetch Inventory using AIS caps 2023-03-15 20:18:38 +02:00
Ansariel b157ab47c0 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagentui.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llfloateravatarrendersettings.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/de/floater_tools.xml
#	indra/newview/skins/default/xui/en/floater_display_name.xml
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/ru/floater_tools.xml
 2023-01-12 16:56:08 +01:00
Andrey Kleshchev 3d6c4036a6 SL-18799 Crash at requestPostCapability 2022-12-07 08:55:45 +02:00
Beq 69ad8212f3 [OPENSIM] Make sure the correct UUID is used for library 2022-05-25 17:15:03 +01:00
Ansariel 4884752464 FIRE-21376: Inventory not loading properly on OpenSim; previous change might not work as HTTP inventory is enabled by default, so always use the old pattern for everything not SL 2017-08-03 18:28:47 +02:00
Ansariel 4389b298a1 FIRE-21376: Inventory not loading properly on OpenSim 2017-08-03 18:23:37 +02:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
andreykproductengine 5580080276 MAINT-7274 Placeholder text shouldn't be shown 2017-04-03 18:35:21 +03:00