ad30637ebe
#3452 Crash in LLSaleInfo::asLLSD()
2025-01-22 18:59:38 +02:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
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
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
2b31dad400
miscellaneous: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
5e4afb76af
llinventory: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
e0b7cb8e9a
Issue #30 Notecard losing thumbnail data
2024-01-23 13:01:09 +02:00
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
826310bcab
Fixed INV_THUMBNAIL_LABEL handling missed in rebase for SL-19968 work
2023-11-03 09:50:03 -07:00
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
c382d4e975
SL-20199 Error creating new folder
2023-08-25 19:26:58 +03:00
4b5b048cb6
SL-20187 [AIS3] Don't fill thumbnail field if null thumbnail is set
2023-08-22 21:14:06 +03:00
04fc8c4db4
SL-18629 Fixed missed case of unpacking metadata
2023-06-27 00:29:34 +03:00
4c3a7b1064
SL-19503 Fix thumbnails not being restored from cache
2023-04-25 00:04:05 +03:00
e7a1ac5db8
SL-19503 Deleting a thumbnail for folder does not remove thumbnail in viewer
2023-04-24 21:53:03 +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
9d90fbc73d
SL-18629 LLTask thumbnail packing and unpacking
2023-03-10 22:43:40 +02:00
e4de43fe5e
SL-18629 Pack thumbnail asset id
2023-03-10 21:30:28 +02:00
80b33a0157
SL-18629 Unpack thumbnail asset id
2023-03-10 20:19:14 +02:00
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
999c8cd3b9
SL-19117 Textures should return asset id when thumbnail is not set
2023-02-01 16:38:47 +02:00
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
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
43941a3d87
SL-13669 tests should cover import/export category from llsd
2020-08-10 20:50:27 +03:00
357edecd9b
SL-13669 Change inventory cache to use a standard LLSD format
2020-08-04 15:30:20 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
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
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
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
6d46132ef5
SH-4216 WIP - finished item/cat update and reorg of aisv3 code
2013-06-10 16:29:10 -04:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
f7c9739fd9
SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of onAISUpdateReceived.
2013-06-05 15:13:48 -04:00
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
6c56c77ec5
SH-4027 WIP - initial implementation of item update via AIS.
2013-05-24 08:53:21 -04:00
a04a706c1b
merge
2013-05-21 16:18:48 -04:00
d843a0d8be
SH-4137 WIP - added callback-based support for purge descendents, remove category
2013-04-25 17:09:05 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
46ab23c94b
llinventory merge fixes
2013-03-11 18:02:16 -04:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
f48011e4d0
SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump
2013-01-15 20:30:20 -05:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
7153d1db11
Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable
2012-09-20 04:29:17 +00:00
4e7c2c6942
CHUI-228 FIX Inventory object creation date initialized with 0 to avoid some folders reporting wrong creation date.
2012-08-02 22:49:42 +03:00
3882e9c177
CHUI-101 WIP Make LLFolderview general purpose
...
more compilation fixes, just need to add getName() back to LLInventoryFilter et al
2012-06-20 00:19:05 -07:00
Andrey Kleshchev