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

119 Commits (cbf6aca2e8ebd32d29b70f2d582044153da05eab)

Author SHA1 Message Date
Ansariel 5f9fb4a395 Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
#	indra/newview/installers/darwin/release-dmg/background.jpg
#	scripts/messages/message_template.msg.sha1
 2023-10-26 21:25:27 +02:00
Andrey Kleshchev cebbdf2d12 SL-20436 New accounts that select outfit in web fail to download clothing 2023-10-12 18:53:57 +03:00
Ansariel ce332e0755 Merge branch 'main' of https://github.com/secondlife/viewer 2023-10-04 02:44:58 +02:00
Andrey Kleshchev 81752116e1 SL-20298 Fix recursive fetch not working properly. 2023-09-20 18:50:12 +03:00
Ansariel a45c5826dc Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llvovolume.cpp
 2023-09-12 14:20:54 +02:00
Andrey Kleshchev f107d8431c SL-20199 Fix invalid or oversized folder being refetched indefinetely 2023-09-11 17:33:55 +03:00
Ansariel 7c5671465e Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llaisapi.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
 2023-08-25 02:16:13 +02:00
Andrey Kleshchev 74a1d2582c SL-20162 Better cof version logging 
And fixed some typos
 2023-08-17 19:50:16 +03:00
Ansariel 6ee5d6053f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/skins/default/xui/de/notifications.xml
 2023-07-18 10:22:07 +02:00
Andrey Kleshchev acf82867b6 Merge branch 'main' (DRTVWR-580) into DRTVWR-567 
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorymodelbackgroundfetch.cpp
 2023-07-17 23:34:59 +03:00
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
Ansariel b088231520 Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 2023-05-31 10:52:44 +02:00
Andrey Kleshchev 5b9b4fcf66 SL-17429 Message user when their inventory hits AIS2 limits 2023-05-30 00:04:57 +03: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 0f01fce98c Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
 2023-05-18 14:33:59 +02:00
Andrey Kleshchev 42f16180a9 SL-19536 SL-19652 Fix inventory fetching 2023-05-10 18:41:55 +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
Ansariel ccb1dfa072 Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
 2023-05-02 20:11:20 +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 1491eea28c SL-19652 Folder fetch dupplicate protection and over limit handling 2023-04-25 22:47:31 +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