Commit Graph

98 Commits (6f072c2121fcb6f00ccc773d0ff4edc5cbfb013b)

Author SHA1 Message Date
Andrey Kleshchev 3b8b408b90 #3969 Make inventory creation from cache faster
Still has a lot of space for improvements, but should be 2.5 times faster
2025-07-28 11:48:53 +03:00
Andrey Kleshchev f73e0d09aa #3905 Crashes in LLInventoryModel::saveToFile
I don't expect it to fix the problem. Just making things more explicit
in places of most frequent crashes.
2025-05-05 18:28:08 +03:00
Andrey Lihatskiy 5d7a5001b4 Merge commit '9e24b30' into marchcat/maint-c/restore
# Conflicts:
#	indra/llmath/v2math.cpp
#	indra/llmath/v2math.h
#	indra/llmath/v3math.h
#	indra/llmath/v4math.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/llui/llfolderviewmodel.h
#	indra/llui/llmodaldialog.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/llavatarrenderinfoaccountant.cpp
#	indra/newview/llconversationmodel.h
#	indra/newview/llfloaterinventorysettings.cpp
#	indra/newview/llfloaternamedesc.cpp
#	indra/newview/llfloaternamedesc.h
#	indra/newview/llfloaterobjectweights.cpp
#	indra/newview/llfloaterobjectweights.h
#	indra/newview/llfolderviewmodelinventory.h
#	indra/newview/llinspecttexture.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorygallery.h
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmaterialeditor.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpanelgroupcreate.cpp
#	indra/newview/llpanelgroupgeneral.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llreflectionmap.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llteleporthistorystorage.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltexturefetch.h
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewercamera.cpp
#	indra/newview/llviewercamera.h
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/tests/llviewerassetstats_test.cpp
2025-04-10 06:01:50 +03:00
Andrey Kleshchev ad30637ebe #3452 Crash in LLSaleInfo::asLLSD() 2025-01-22 18:59:38 +02: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
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp
2024-05-22 19:04:52 +02:00
Andrey Kleshchev a420e84f48 viewer#1424 Favorites in Appearance floater #2 2024-05-09 23:50:02 +03:00
Andrey Kleshchev bbadb8b390 Viewer#1301 Small cleanup
notecards do not need to store 'favorite' flag
2024-05-02 21:08:41 +03:00
Andrey Kleshchev fc5e5327bc Viewer#1301 Implement Inventory Favorites Tab WIP#2 2024-05-02 03:05:41 +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 384d694aba viewer#1300 Inventory favorites context menu 2024-04-27 00:39:49 +03:00
Andrey Kleshchev a220acb454 viewer#1300 Inventory favorites basic framework 2024-04-27 00:39:47 +03:00
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
Lars Næsbye Christensen 2b31dad400 miscellaneous: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
Lars Næsbye Christensen 5e4afb76af llinventory: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
Andrey Kleshchev e0b7cb8e9a Issue #30 Notecard losing thumbnail data 2024-01-23 13:01:09 +02:00
Brad Linden afa45530f7 SL-19968 disabled pump_idle_network for now due to it causing several failures during login
also added suggested continue statements, and removed obsolete
LLInventoryItem::fromLLSD deserialization codepath.
2023-11-06 14:30:33 -08:00
Brad Linden 826310bcab Fixed INV_THUMBNAIL_LABEL handling missed in rebase for SL-19968 work 2023-11-03 09:50:03 -07:00
Brad Kittenbrink (Brad Linden) b9b38db567 Fix for SL-19968 objects missing timing bug due to stall during login
ensure inventory skeleton loading doesn't block the message system from processing packets.
2023-11-03 09:49:48 -07:00
Andrey Kleshchev c382d4e975 SL-20199 Error creating new folder 2023-08-25 19:26:58 +03:00
Andrey Kleshchev 4b5b048cb6 SL-20187 [AIS3] Don't fill thumbnail field if null thumbnail is set 2023-08-22 21:14:06 +03:00
Andrey Kleshchev 04fc8c4db4 SL-18629 Fixed missed case of unpacking metadata 2023-06-27 00:29:34 +03:00
Andrey Kleshchev 4c3a7b1064 SL-19503 Fix thumbnails not being restored from cache 2023-04-25 00:04:05 +03:00
Andrey Kleshchev e7a1ac5db8 SL-19503 Deleting a thumbnail for folder does not remove thumbnail in viewer 2023-04-24 21:53:03 +03:00
Andrey Kleshchev 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
Andrey Kleshchev 9d90fbc73d SL-18629 LLTask thumbnail packing and unpacking 2023-03-10 22:43:40 +02:00
Andrey Kleshchev e4de43fe5e SL-18629 Pack thumbnail asset id 2023-03-10 21:30:28 +02:00
Andrey Kleshchev 80b33a0157 SL-18629 Unpack thumbnail asset id 2023-03-10 20:19:14 +02:00
Andrey Kleshchev cf901b5abb SL-19282 Thumbnail adjustments
Follow links, fix outfts missing 'image' option, adjust inspector, recolor 'worn' in gallery
2023-03-02 01:46:46 +02:00
Andrey Kleshchev 999c8cd3b9 SL-19117 Textures should return asset id when thumbnail is not set 2023-02-01 16:38:47 +02:00
Brad Payne (Vir Linden) 819eec6f8c SL-18924 - basic get/set functions for thumbnail UUID, removed obsolete binary pack/unpack functions for inventory 2023-01-09 21:14:16 +00:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Mnikolenko Productengine 43941a3d87 SL-13669 tests should cover import/export category from llsd 2020-08-10 20:50:27 +03:00
Mnikolenko Productengine 357edecd9b SL-13669 Change inventory cache to use a standard LLSD format 2020-08-04 15:30:20 +03:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 12f0f8cb72 changed over to manual naming of MemTrackable stats
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -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
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Brad Payne (Vir Linden) 6d46132ef5 SH-4216 WIP - finished item/cat update and reorg of aisv3 code 2013-06-10 16:29:10 -04:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Brad Payne (Vir Linden) f7c9739fd9 SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of onAISUpdateReceived. 2013-06-05 15:13:48 -04:00
Brad Payne (Vir Linden) 34d2cd0376 SH-4207 WIP - use item updates with callback when updating link descriptions. Reworked updateAppearanceFromCOF() cof-validation stages. 2013-05-24 15:51:33 -04:00
Brad Payne (Vir Linden) 6c56c77ec5 SH-4027 WIP - initial implementation of item update via AIS. 2013-05-24 08:53:21 -04:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Brad Payne (Vir Linden) d843a0d8be SH-4137 WIP - added callback-based support for purge descendents, remove category 2013-04-25 17:09:05 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00