f3fa991d2c
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorymodel.cpp
2023-08-09 11:18:16 +02:00
6b5345eabd
SL-20120 Fix unneeded warnings
...
- Don't Warn about unknown cof version, it's expected during fetch, Info is enough
- Fix 'unexpected attachments' due to unknown cof, also should fix viewer trying to create a link before cof is ready
- Fix 'accounting' warnings when getting item updates for unfetched folders (Note: viewer doesn't know folders version, if fetch is already in progress we might get an old version)
2023-08-05 17:44:10 +03:00
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
3058e6e6fd
SL-20015 wait for the outfit items to load before wearing it
2023-07-19 21:15:52 +03:00
147dc16bc5
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-06-19 11:17:10 +02:00
14eadadf99
SL-19857 Exception at category creation
2023-06-13 22:48:50 +03:00
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
2331190310
Revert "SL-19795 Unified scroll"
2023-05-31 21:26:06 +03:00
63df00d4e5
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllayoutstack.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelwearing.h
# indra/newview/llviewermessage.cpp
2023-05-17 20:35:53 +02:00
6e2e9d5904
SL-19649 Adjust other classes for new deleteAllChildren mechanics
2023-05-12 19:01:44 +03:00
98681ef73f
SL-19533 Prevent COF dupplicate request
2023-05-05 15:56:21 +03:00
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
c008d3e030
SL-19533 Reduce inventory fetch stalls
2023-04-25 12:27:44 +03:00
4c3a7b1064
SL-19503 Fix thumbnails not being restored from cache
2023-04-25 00:04:05 +03:00
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
53f2e1710a
SL-19533 Faster declouding
2023-04-13 02:20:42 +03:00
bb4967817e
SL-18918 Fix folder type when creating folders
...
Might be better to replace "type" with "type_default" everywere, not just for AIS
2023-04-07 21:02:10 +03:00
a2ef7c8076
SL-18672 Update handling of login skeleton to handle new fields
2023-03-31 01:19:58 +03:00
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
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
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
11b2f138ce
SL-19502 Copying folders should copy thumbnails
2023-03-29 04:28:07 +03:00
3bf9c78f56
SL-18003 Improve dupplicate prevention
...
Try getting lost and found
2023-03-28 21:37:32 +03:00
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
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
110ed8f4d3
SL-18003 Don't cause excessive full rebuild
2023-03-28 00:53:35 +03:00
9fa64f1e20
SL-18003 Fix items not being marked as complete when fetched via ais
2023-03-24 18:03:09 +02:00
6826ed7167
SL-19445 Increment inventory cache version for Inventory thumbnails
...
Inventory thumbnails appear as lost when moving between non thumbnail and thumbnail viewers.
Release viewer doesn't know to cache thumbnails, thumbnail viewer loads release's cache and finds no thumbnails, but version control appears to be valid so viewer thinks there is nothing to download.
2023-03-24 00:09:04 +02:00
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
40b731eb76
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
...
# Conflicts:
# .gitignore
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2023-03-21 10:57:56 +01:00
b68a674910
SL-18629 Load cof only once links are ready
2023-03-20 23:39:30 +02:00
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
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
72131418aa
SL-18629 Rebuild brocken link on fetch compeltion.
2023-03-19 16:11:21 +02:00
7dad882c2f
SL-18629 MAC build fix
2023-03-18 03:05:08 +02:00
0a2a1b3564
SL-18674 Cleanup
2023-03-18 01:41:36 +02:00
f98c1403fb
SL-18674 Reenable folder creation via AIS v3
...
Add item fetching via AIS v3
2023-03-18 01:15:27 +02:00
4f9f149939
SL-18629 Try fetching inventory on BulkUpdateInventory to get missing data
2023-03-17 22:42:14 +02:00
ac145cb21f
SL-18629 WIP Fetch Inventory using AIS caps
2023-03-15 20:18:38 +02:00
cd61492723
SL-19109 Fix item updates not getting a callback #2
2023-03-13 15:42:13 +02:00
80b33a0157
SL-18629 Unpack thumbnail asset id
2023-03-10 20:19:14 +02:00
ff6ff01c6a
SL-18629 Replacing UDP creation messages with callback based AIS
2023-03-10 19:32:47 +02:00
811da7dbb1
SL-18629 WIP Replacing UDP creation messages with callback based AIS #2
...
findCategory and move_item_to_marketplacelistings
2023-03-10 19:32:47 +02:00
6895025a35
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/floater_my_inventory.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-03-06 15:23:21 +01:00
8b8d4795a7
SL-18629 Generic message for BulkUpdateInventory
2023-03-05 22:36:52 +02:00
2bc4fb2bf0
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.cpp
# indra/llui/llview.h
# indra/newview/llaisapi.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterproperties.cpp
# indra/newview/llfloaterproperties.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelmarketplaceinbox.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
# indra/newview/skins/default/xui/en/sidepanel_task_info.xml
# indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
51142d1341
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llpanelmaininventory.cpp
2023-02-03 16:53:33 +02:00
f7f941ae5b
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.cpp
2023-02-03 13:06:40 +01:00
130ac29ea6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 12:58:42 +01:00
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
Ansariel