summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
AgeCommit message (Collapse)Author
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-12Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
# Conflicts: # indra/llimage/llimageworker.cpp # indra/llimage/llimageworker.h # indra/newview/llcontrolavatar.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/lltexturefetch.cpp
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-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml
2023-10-17SL-20232 Allow deletion of worn items #1Andrey Kleshchev
2023-10-03Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/llui/lltooltip.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/textures/textures.xml
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-08-02SL-19982 Update font for menu items; show object's name in lsl editorMnikolenko Productengine
2023-07-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-07-17Merge branch 'main' (DRTVWR-580) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp
2023-03-19SL-19099 The long name of the item is out of bounds on the Editing ↵Alexander Gavriliuk
Tools/Content tab
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-03Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llappearancemgr.cpp # indra/newview/llpanelmaininventory.cpp
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
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-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-10-19SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into ↵Andrey Lihatskiy
DRTVWR-570-maint-Q
2022-10-19Reduce folderview menu bloat via lazy creation on right clickRye Mutt
2022-10-08SL-18326 GLTF material functionality in a NotecardAndrey Kleshchev
2022-09-30SL-18235 Remove outfit buttons from unpacking dialogMnikolenko Productengine
2022-09-28SL-18233 Double clicking material in an object shows notecardAndrey Kleshchev
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
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-07-01SL-17493 Show total object count in object inventoryAndrey Kleshchev
2022-06-29SL-17685 Drag and drop material support WIPDave Parks
2022-06-27Continuing progress on SL-17602 inventory support for Materials. now have ↵Brad Kittenbrink
working inventory bridge implementations
2022-01-20SL-16672 Fix object's inventory not sorting contentAndrey Kleshchev
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-13SL-12537 Fixed crash when the box with 'script' moves between two regionsandreykproductengine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-04-22SL-8012 Remove Mesh Filter Option on Inventoryandreykproductengine
2019-04-15SL-10953 Fixed “No contents” is displayed when adding a large number of ↵andreykproductengine
items a few times
2018-06-21MergeRider Linden
2018-06-20Adding settings DAD typeRider Linden
2018-06-08Settings inventory picker.Rider Linden
2018-05-02MAINT-8531 Remove viewer UI which supports buying items out of task inventorymaxim_productengine
2018-05-01MAINT-8598 Fixed Incorrect context menu for sounds in task inventoryAndrey Kleshchev
2018-01-15MAINT-8184 "Properties" menu item should be disable for multiple selection ↵Mnikolenko Productengine
in Object content
2017-08-04SL-717 Additional search options for inventory windowMnikolenko Productengine
2017-05-04MAINT-7357 Disable delete function of the Backspace key on WindowsMnikolenko Productengine
2017-01-30MAINT-6959 Dummy callback to prevent log spamandreykproductengine
2017-01-27MAINT-86 Fixed object-contents aren't updated after wearing from groundandreykproductengine
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden