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

129 Commits (a831237e29c650146b6870b568feddcda310ab29)

Author SHA1 Message Date
Ansariel 83f2a7b9ce Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llaisapi.cpp
 2023-12-08 00:05:11 +01:00
Beq 877e18951e FIRE-33337/BUG-234770 - Avoid rename issue caused by AIS version mismatch 
This is a workaround to a wider problem, but the workaround is valid even when the current cause (too many calls to accountForUpdate) is fixed
 2023-12-07 21:31:31 +00:00
Beq 430c8a766e FIRE-33337/BUG-234770 - Avoid rename issue caused by AIS version mismatch 
This is a workaround to a wider problem, but the workaround is valid even when the current cause (too many calls to accountForUpdate)
 2023-12-07 17:45:20 +00:00
Ansariel eeeeefadb7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-11 11:25:27 +02:00
Ansariel 835222cccb Change inventory parse order so callbacks for categories are called first before callbacks for items 2023-10-05 11:39:35 +02:00
Ansariel 9636801773 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml
 2023-10-04 12:28:33 +02:00
Andrey Kleshchev 5d7b1b09ff MacOS build fix 2023-10-04 00:01:51 +03:00
Andrey Kleshchev 5566f28b03 D559 Post merge fixes 2023-10-03 20:13:23 +03:00
Ansariel e14473f2c7 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lltabcontainer.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/strings.xml
 2023-09-20 12:52:23 +02:00
Andrey Kleshchev fa47e4402b SL-20285 Sturdier cof and fixed link fetching 2023-09-14 18:51:33 +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
Andrey Kleshchev 8e1c5fee2b SL-18629 Better item fetch error handling 2023-08-09 12:52:17 +03:00
Ansariel f3fa991d2c Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventorymodel.cpp
 2023-08-09 11:18:16 +02:00
Andrey Kleshchev cd8fcec5fe SL-20120 Fix ais depth 'body' being misplaced. 2023-08-06 15:22:38 +03:00
Andrey Kleshchev 201cd96105 SL-20120 Fix folders with unknown content being assigned a version 2023-08-05 17:44:10 +03:00
Andrey Kleshchev dd699f84c9 SL-20120 Do not account for deltas when fetching 
Is supposed to set version and descendant info in parseCategory
 2023-08-05 02:10:53 +03:00
Andrey Kleshchev 05b5540fe7 SL-20107 Detaching items from COF in gallery view didn't update COF 2023-08-01 23:53:57 +03:00
Ansariel 4ebb423335 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llaisapi.cpp
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lltexturectrl.cpp
 2023-07-22 11:47:19 +02:00
Maxim Nikolenko 3058e6e6fd
SL-20015 wait for the outfit items to load before wearing it 2023-07-19 21:15:52 +03:00
Ansariel 23cf219d4a Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
 2023-06-12 18:46:25 +02:00
Andrey Kleshchev 42e6c35ace SL-17429 Message user when their inventory hits AIS3 limits #2 2023-06-02 23:03:52 +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 d42f2a1887 SL-17429 Message user when their inventory hits AIS3 limits 2023-05-30 00:01:58 +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 4bfcf182d7 SL-19533 Fetch stall prevention #2 2023-04-28 19:34:26 +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 0091fa0cba SL-19583 Uniform risizing for combination inventory view 2023-04-26 03:53:17 +03:00
Andrey Kleshchev 8166a8d8d4 SL-19533 Fix a fetch blunder 2023-04-25 13:10:51 +03:00
Andrey Kleshchev c008d3e030 SL-19533 Reduce inventory fetch stalls 2023-04-25 12:27:44 +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 6d0c07840c SL-19533 Cap folder request depth 2023-04-20 20:05:25 +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 5e59ab0ab7 SL-19533 Further logging improvements 2023-04-12 00:39:48 +03:00
Andrey Kleshchev 69e3b5fb40 SL-19533 Orphans plus additional logging 2023-04-11 01:58:28 +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 6fd7427c57 SL-18003 Bulk fetch some items by fetching whole folder 2023-03-26 13:44:50 +03:00
Andrey Kleshchev 9fa64f1e20 SL-18003 Fix items not being marked as complete when fetched via ais 2023-03-24 18:03:09 +02:00
Andrey Kleshchev 04501955c7 SL-19108 Disable "Image" button for task inventories 
Thumbnails are not supported for task inventories yet
 2023-03-23 21:13:39 +02:00
Andrey Kleshchev b68a674910 SL-18629 Load cof only once links are ready 2023-03-20 23:39:30 +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 f98c1403fb SL-18674 Reenable folder creation via AIS v3 
Add item fetching via AIS v3
 2023-03-18 01:15:27 +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 7a70d93c43 SL-18629 Fetch Inventory using AIS caps #3 2023-03-15 20:18:38 +02:00