126 Commits (master)

Author	SHA1	Message	Date
Ansariel	4c355879cc	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llui/llfolderviewitem.h # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/newview/app_settings/settings.xml # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloatermodelpreview.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfilter.cpp # indra/newview/llinventoryfilter.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelmaininventory.cpp # indra/newview/llpaneloutfitedit.cpp # indra/newview/llpaneloutfitsinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelpermissions.h # indra/newview/llpanelwearing.cpp # indra/newview/llpanelwearing.h # indra/newview/llselectmgr.h # indra/newview/llskinningutil.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturefetch.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/llviewerattachmenu.cpp # indra/newview/llviewerinventory.cpp # indra/newview/llviewerinventory.h # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llwearableitemslist.cpp # indra/newview/skins/default/textures/textures.xml # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/floater_object_weights.xml # indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml # indra/newview/skins/default/xui/en/menu_inventory.xml # indra/newview/skins/default/xui/en/menu_outfit_tab.xml # indra/newview/skins/default/xui/en/menu_wearing_tab.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_main_inventory.xml # indra/newview/skins/default/xui/en/panel_outfit_gallery.xml # indra/newview/skins/default/xui/en/panel_outfits_list.xml # indra/newview/skins/default/xui/en/panel_outfits_wearing.xml # indra/newview/skins/default/xui/en/panel_places.xml # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml # indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/en/sidepanel_appearance.xml # indra/newview/skins/default/xui/en/strings.xml # indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml	2025-04-16 17:49:47 +02: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	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	a17fd2352a	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcharacter/llkeyframemotion.cpp # indra/llcharacter/llmotioncontroller.cpp # indra/llcrashlogger/llcrashlogger.cpp # indra/llimage/llimagetga.cpp # indra/llmessage/llregionflags.h # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/llmodel.cpp # indra/llrender/llrendertarget.cpp # indra/llui/llconsole.cpp # indra/llui/llkeywords.cpp # indra/llui/llscrolllistctrl.cpp # indra/llui/lltextbase.cpp # indra/llui/lltexteditor.cpp # indra/llui/llurlentry.cpp # indra/newview/llappearancemgr.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llgiveinventory.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelteleporthistory.cpp # indra/newview/llvocache.cpp	2024-06-09 16:11:24 +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
Ansariel	0ecfbc3de9	Merge remote-tracking branch 'LGPL/master' ... # Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llappearance/llwearable.cpp # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp # indra/newview/llimpanel.cpp # 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/llpaneleditwearable.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # 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/llviewermenu.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h	2024-05-16 14:10:55 +02:00
Andrey Kleshchev	a420e84f48	viewer#1424 Favorites in Appearance floater #2	2024-05-09 23:50:02 +03:00
Ansariel	5f1a19af72	Merge remote-tracking branch 'LL/marchcat/x-ws-merge' ... # Conflicts: # autobuild.xml # indra/linux_crash_logger/llcrashloggerlinux.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llcallbacklist.cpp # indra/newview/llimpanel.h	2024-05-01 12:30:57 +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
Ansariel	7a2070d795	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # 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/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelgroupbulkban.cpp # indra/newview/llscrollingpanelparam.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/llvovolume.cpp	2024-04-24 18:59:46 +02: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	d0102af56d	Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A ... # Conflicts: # indra/llcommon/llapp.cpp # indra/llcommon/llapp.h # indra/llimage/llimageworker.cpp # indra/llui/llcontainerview.cpp # indra/llui/llcontainerview.h # indra/llui/llkeywords.cpp # indra/llui/lltabcontainer.cpp # indra/llui/lltextbase.cpp # indra/newview/llappviewer.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfavoritesbar.h # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llhudnametag.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelvoicedevicesettings.h # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llselectmgr.cpp # indra/newview/lltranslate.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewermessage.cpp	2024-04-11 21:59:38 +02:00
Ansariel	0dd4b94ef0	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llcommon/llapp.cpp # indra/llcommon/llapp.h # indra/llcommon/llpointer.h # indra/llimage/llimageworker.cpp # indra/llui/llcontainerview.cpp # indra/llui/llcontainerview.h # indra/llui/llkeywords.cpp # indra/llui/lltabcontainer.cpp # indra/llui/lltextbase.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llappviewer.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfavoritesbar.h # indra/newview/llfloaterpreference.cpp # indra/newview/llhudnametag.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelvoicedevicesettings.h # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llscrollingpanelparam.cpp # indra/newview/llselectmgr.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewermessage.cpp # indra/newview/llviewerregion.cpp # indra/newview/skins/default/xui/en/panel_performance_complexity.xml # indra/newview/skins/default/xui/en/panel_performance_huds.xml	2024-04-10 12:32:32 +02:00
Ansariel	2474e3ba1d	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp	2024-04-10 10:03:37 +02:00
Andrey Lihatskiy	84dfe55810	Merge branch 'main' into marchcat/y-merge ... # Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp	2024-04-10 07:08:25 +03:00
Ansariel	c63b3eca4c	Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/llurlregistry.cpp # indra/newview/llcontrolavatar.cpp	2024-03-01 21:00:56 +01:00
Andrey Kleshchev	44ea949079	Issue#900 Crash at LLInventoryAddItemByAssetObserver	2024-02-27 23:14:44 +02:00
Ansariel	b71c7f37ea	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llagent.cpp # indra/newview/llagent.h # indra/newview/llagentcamera.cpp # indra/newview/llagentcamera.h # indra/newview/llappviewer.cpp # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llattachmentsmgr.cpp # indra/newview/llattachmentsmgr.h # indra/newview/llavataractions.cpp # indra/newview/llcallingcard.cpp # indra/newview/llcompilequeue.cpp # indra/newview/llcontrolavatar.h # indra/newview/lldirpicker.cpp # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolalpha.h # indra/newview/lldrawpoolavatar.h # indra/newview/lldynamictexture.cpp # indra/newview/llfasttimerview.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfloateravatarpicker.cpp # indra/newview/llfloaterbeacons.cpp # indra/newview/llfloaterbvhpreview.cpp # indra/newview/llfloatercamera.cpp # indra/newview/llfloaterchangeitemthumbnail.cpp # indra/newview/llfloaterdisplayname.cpp # indra/newview/llfloatergotoline.cpp # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterland.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llfloaterpreferencesgraphicsadvanced.cpp # indra/newview/llfloaterscriptdebug.cpp # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatersnapshot.cpp # indra/newview/llfloatertools.cpp # indra/newview/llfloatertools.h # indra/newview/llfloateruipreview.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llgesturemgr.cpp # indra/newview/llgiveinventory.cpp # indra/newview/llglsandbox.cpp # indra/newview/llgroupactions.cpp # indra/newview/llhudeffectlookat.cpp # indra/newview/llhudeffectlookat.h # indra/newview/llhudicon.cpp # indra/newview/llhudmanager.cpp # indra/newview/llhudtext.cpp # indra/newview/llhudtext.h # indra/newview/llimprocessing.cpp # indra/newview/llimview.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodel.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/lllocalbitmaps.cpp # indra/newview/lllogininstance.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llmodelpreview.h # indra/newview/llmutelist.cpp # indra/newview/llnavigationbar.cpp # indra/newview/llnavigationbar.h # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h # indra/newview/llnotificationlistitem.cpp # indra/newview/lloutputmonitorctrl.cpp # indra/newview/llpanelcontents.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelexperiencepicker.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelgroup.cpp # indra/newview/llpanelgroupnotices.cpp # indra/newview/llpanelgrouproles.cpp # indra/newview/llpanellandaudio.cpp # indra/newview/llpanellandmarks.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelobject.cpp # indra/newview/llpanelobject.h # indra/newview/llpanelpeople.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelplaces.cpp # indra/newview/llpanelpresetspulldown.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelsnapshot.h # indra/newview/llpanelvolume.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llpreviewanim.cpp # indra/newview/llpreviewgesture.cpp # indra/newview/llpreviewnotecard.cpp # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llpreviewtexture.cpp # indra/newview/llpreviewtexture.h # indra/newview/llselectmgr.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsnapshotlivepreview.cpp # indra/newview/llstartup.cpp # indra/newview/llstatusbar.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturecache.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturefetch.cpp # indra/newview/lltoastimpanel.cpp # indra/newview/lltoolbarview.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/lltoolface.cpp # indra/newview/lltoolfocus.cpp # indra/newview/lltoolgrab.cpp # indra/newview/lltoolgun.cpp # indra/newview/lltoolgun.h # indra/newview/lltoolpie.cpp # indra/newview/lltoolplacer.cpp # indra/newview/lltoolselect.cpp # indra/newview/lluploaddialog.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llvieweraudio.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llviewerfoldertype.cpp # indra/newview/llviewerinput.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewermenu.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewermessage.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewerobject.h # indra/newview/llviewerobjectlist.cpp # indra/newview/llviewerobjectlist.h # indra/newview/llviewerparcelmgr.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerregion.h # indra/newview/llviewershadermgr.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexlayer.h # indra/newview/llviewertexture.cpp # indra/newview/llviewertexture.h # indra/newview/llviewertexturelist.h # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvoavatarself.h # indra/newview/llvoiceclient.h # indra/newview/llvosky.cpp # indra/newview/llvosurfacepatch.cpp # indra/newview/llvotree.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/llvowater.cpp # indra/newview/llworld.cpp # indra/newview/llworldmapview.cpp # indra/newview/llworldmipmap.cpp # indra/newview/pipeline.cpp	2024-02-22 11:43:04 +01:00
Ansariel	60d3dd98a4	Convert remaining BOOL to bool	2024-02-21 23:14:31 +02:00
Ansariel	e341621a8e	Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llcommon/llmemory.cpp # indra/llui/lltooltip.cpp # indra/newview/llagent.cpp # indra/newview/llpanelteleporthistory.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml # indra/newview/skins/default/xui/en/notifications.xml	2023-12-27 13:00:20 +01:00
Andrey Lihatskiy	aed6313d7c	Merge branch 'main' into DRTVWR-594-maint-Y	2023-12-18 06:33:57 +02:00
Andrey Kleshchev	f4307bed26	SL-20181 Don't force fetch if vesion is unknown	2023-12-06 01:02:42 +02:00
Andrey Kleshchev	d2ade35b09	SL-20651 DragnDrop from library in gallery mode doesn't work	2023-11-28 15:11:52 +02:00
Ansariel	5f9fb4a395	Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/newview/CMakeLists.txt # indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns # indra/newview/installers/darwin/release-dmg/background.jpg # scripts/messages/message_template.msg.sha1	2023-10-26 21:25:27 +02:00
Andrey Kleshchev	cebbdf2d12	SL-20436 New accounts that select outfit in web fail to download clothing	2023-10-12 18:53:57 +03:00
Ansariel	9eb885fd89	Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llviewerobject.cpp # 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/it/panel_main_inventory.xml # indra/newview/skins/default/xui/ja/panel_main_inventory.xml # indra/newview/skins/default/xui/pl/panel_main_inventory.xml # indra/newview/skins/default/xui/ru/panel_main_inventory.xml	2023-10-04 12:45:40 +02:00
Andrey Kleshchev	aee8f570e1	SL-20368 Request outfits using 'links' ... instead of getting items one by one	2023-10-03 21:14:34 +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	b09c19d27c	SL-20285 Updated individual request count declaration	2023-09-14 20:58:42 +03: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
Ansariel	fc5a86a6cc	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h	2023-08-25 01:19:32 +02:00
Andrey Kleshchev	3d73a10da3	Merge branch main (DRTVWR-582) into DRTVWR-567 ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml	2023-08-23 22:40:17 +03:00
Andrey Kleshchev	fa5af90e30	SL-18629 Fix observers failing to start fetching items in some cases ... start(folder.first) ignored fetch request due to folder having version	2023-08-15 00:00:40 +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	3c23be758e	SL-19534 Fixed fetch timeout during initial fetch	2023-04-06 21:51:17 +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	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
Andrey Kleshchev	b00e2da9e2	SL-18003 Faster cof fetching	2023-03-27 21:04:51 +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	1800e969c5	SL-18003 Use AISv3 cap in LLInventoryFetchItemsObserver	2023-03-24 00:34:48 +02:00
Andrey Kleshchev	24f8f47d46	SL-19188 Fix thumbnail changes being ignored by outfit gallery	2023-03-21 23:59:03 +02:00
Ansariel	f65cddf860	Merge branch 'contribute' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llcommon/llsdserialize.cpp # indra/llcommon/lluuid.cpp # indra/llcommon/lluuid.h # indra/llprimitive/llmodel.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/llinventorymodel.cpp # indra/newview/llviewerwearable.h # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/da/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/de/floater_perm_prefs.xml # indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/en/strings.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/fr/floater_perm_prefs.xml # indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/it/floater_perm_prefs.xml # indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/ja/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/pl/floater_about.xml # indra/newview/skins/default/xui/pl/floater_about_land.xml # indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml # indra/newview/skins/default/xui/pl/floater_associate_listing.xml # indra/newview/skins/default/xui/pl/notifications.xml # indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml # indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml # indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml # indra/newview/skins/default/xui/pl/panel_profile_pick.xml # indra/newview/skins/default/xui/pl/panel_profile_picks.xml # indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml # indra/newview/skins/default/xui/pl/panel_region_access.xml # indra/newview/skins/default/xui/pl/panel_script_experience.xml # indra/newview/skins/default/xui/pl/strings.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/pt/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/ru/floater_perm_prefs.xml # indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/tr/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/zh/floater_about.xml # indra/newview/skins/default/xui/zh/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml	2023-03-01 12:54:24 +01:00
Henri Beauchamp	c3ab948724	Added a digest_t typedef to clarify the usage of the digest LLUUID ... As suggested in comments for previous commit.	2023-02-07 22:18:44 +01:00
Henri Beauchamp	bf7faa3267	Faster and simpler inventory category hashing. ... This commit changes inventory category hashing from slow LLMD5 to fast HBXX128 hashing, and allows to use a simple LLUUID for the hash, instead of an LLMD5 instance. It also removes some old cruft dealing with unused baked texture hashing.	2023-02-06 11:30:23 +01:00
Beq	69ad8212f3	[OPENSIM] Make sure the correct UUID is used for library	2022-05-25 17:15:03 +01:00
Ansariel	1c14d0b1d5	Merge viewer-neko	2017-06-20 22:43:35 +02:00