Andrey Lihatskiy
|
ae93198735
|
Merge branch 'main' into marchcat/maint-c-restore
# Conflicts:
# indra/llcommon/lldate.h
# indra/newview/llappviewer.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmaterialeditor.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llvoavatar.cpp
|
2025-04-15 19:31:20 +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
|
0e26d7717d
|
viewer#945 Some worn items are missing from Avatar floater's Outfits tab
# Conflicts:
# indra/newview/lloutfitslist.cpp
|
2025-03-11 01:23:53 +02:00 |
|
Ansariel
|
b42f9d836b
|
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
|
2024-06-01 15:49:26 +02: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 Lihatskiy
|
dcb85f9f9d
|
Merge branch 'marchcat/w-whitespace' into release/maint-c
|
2024-05-15 12:07:29 +03:00 |
|
Alexander Gavriliuk
|
18f23d9a55
|
secondlife/viewer#1360 Avoid of using avatar full names
|
2024-05-02 02:14:21 +02: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 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 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Lars Næsbye Christensen
|
2b31dad400
|
miscellaneous: BOOL (int) to real bool
|
2024-02-12 23:17:22 +02:00 |
|
Andrey Kleshchev
|
9f3edb90d4
|
SL-20181 Minor inventory fetching adjustements
|
2023-12-06 01:02:42 +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 |
|
Andrey Kleshchev
|
fa47e4402b
|
SL-20285 Sturdier cof and fixed link fetching
|
2023-09-14 18:51:33 +03: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 |
|
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 |
|
Maxim Nikolenko
|
3058e6e6fd
|
SL-20015 wait for the outfit items to load before wearing it
|
2023-07-19 21:15:52 +03:00 |
|
Andrey Kleshchev
|
42e6c35ace
|
SL-17429 Message user when their inventory hits AIS3 limits #2
|
2023-06-02 23:03:52 +03:00 |
|
Andrey Kleshchev
|
d42f2a1887
|
SL-17429 Message user when their inventory hits AIS3 limits
|
2023-05-30 00:01:58 +03: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 |
|
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 |
|
Andrey Kleshchev
|
3bf9c78f56
|
SL-18003 Improve dupplicate prevention
Try getting lost and found
|
2023-03-28 21:37:32 +03: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 |
|
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 |
|
Andrey Kleshchev
|
83811ff846
|
SL-18629 WIP Fetch Inventory using AIS caps #2
|
2023-03-15 20:18:38 +02:00 |
|
Andrey Kleshchev
|
ac145cb21f
|
SL-18629 WIP Fetch Inventory using AIS caps
|
2023-03-15 20:18:38 +02:00 |
|
Mnikolenko Productengine
|
f14629e690
|
SL-18629 AISv3 draft calls
|
2023-03-15 20:18:38 +02:00 |
|
Andrey Kleshchev
|
0d1f7cafcd
|
SL-19109 Fix item updates not getting a callback
|
2023-03-11 13:53:34 +02:00 |