summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
AgeCommit message (Collapse)Author
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# 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-15Merge branch 'main' into marchcat/x-b-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/ConfigurePkgConfig.cmake # indra/cmake/ICU4C.cmake # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h # indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h # indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llfloateremojipicker.cpp # indra/newview/lloutfitslist.cpp
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-24Merge branch 'main' into marchcat/a-mergeAndrey Lihatskiy
# 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-24Merge branch 'main' into marchcat/b-mergeAndrey Lihatskiy
2024-04-24Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
2024-04-02viewer#1104 Crash at populateFoldersListAndrey Kleshchev
Ensure folder creation callbacks remain alive
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-02-12miscellaneous: BOOL (int) to real boolLars Næsbye Christensen
2024-01-08replace boost library to standardAiraYumi
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-16SL-20575 When opening menu cache results and spread load over framesAndrey Kleshchev
2023-10-17SL-20232 Allow deletion of folders with worn content in tree view #3Andrey Kleshchev
2023-10-17SL-20232 Allow deletion of worn items #1Andrey Kleshchev
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-09-10SL-19826 Implement feedback for dropping into flat folder view Part#2Andrey Kleshchev
2023-09-10SL-19826 Implement feedback for pasting into flat folder view Part#1Andrey Kleshchev
2023-06-23SL-19912 allow drag-n-drop items from Object's content to the GalleryMaxim Nikolenko
2023-06-14SL-19867 'Open in new window' option is missing for 'Trash' and 'Current ↵Maxim Nikolenko
Outfit' folders
2023-03-17SL-19108 Fix folders not showing thumbnailsAndrey Kleshchev
2023-02-27SL-19274 Add new double-click option to Inventory settingsMaxim Nikolenko
2023-02-24SL-19234 add Inventory settings floaterMaxim Nikolenko
2023-02-17SL-19105 WIP Single-folder inventory viewMaxim Nikolenko
2023-02-08SL-19134 Remove llfloaterpropertiesAndrey Kleshchev
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
2023-02-01SL-19104 Clean up inventory UI to prepare for thumbnails (#66)Maxim Nikolenko
2023-02-01SL-19117 Textures should return asset id when thumbnail is not setAndrey Kleshchev
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-07-09SL-17741 Paste is not disabled when copying 'no copy' itemsAndrey Kleshchev
We should allow to copy 'no copy' items for the ability to paste them as links, but regular 'paste' should be disabled in such case Also fixed library items enabling 'paste as link', we can not link library items.
2022-06-27Continuing progress on SL-17602 inventory support for Materials. now have ↵Brad Kittenbrink
working inventory bridge implementations
2022-02-23SL-16904 FIXED The viewer crashes after trying to empty trash containing ↵Mnikolenko Productengine
calling card
2021-07-15DRTVWR-521 improvementAndrey Lihatskiy
2021-07-12DRTVWR-521 xcode buildfixAndrey Lihatskiy
2021-07-02SL-14075 allow exporting multiple textures with the same nameMnikolenko Productengine
2020-10-12SL-14078 Small optimizationAndrey Kleshchev
2020-10-12SL-14078 Maked couple functions as constAndrey Kleshchev
2019-10-16mergeBrad Payne (Vir Linden)
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-06-14SL-11361 Moving folder to My Outfits should create an outfitandreykproductengine
2018-09-26MergeRider Linden
2018-09-19SL-9665 FIXED [EEP] "Rename" greyed out for assets in My Environmentsmaxim_productengine
2018-08-27MAINT-9039 Don't show environment editor floaters in multi-previewmaxim_productengine
2019-04-22SL-8012 Remove Mesh Filter Option on Inventoryandreykproductengine
2018-08-01MAINT-8803 Better UI handling of unrecognized inventory itemsmaxim_productengine
2018-06-04Reconnect apply to region and parcel reconnected to interface.Rider Linden
2018-03-07MergeRider Linden
2018-03-06Settings type inventory objects and upload the assests.Rider Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:13:40 +0000