Commit Graph

996 Commits (0465c761a4cd14003d57d33f5edaa185d6fd7a01)

Author SHA1 Message Date
Andrey Lihatskiy 0465c761a4 Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge
# 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-11-30 12:28:26 +02:00
Maxim Nikolenko 4c7920778f
SL-20457 allow creating new items from the right-click context menu 2023-10-17 18:12:13 +03:00
Alexander Gavriliuk b134e91d2a SL-20419 Receiving new objects or items, etc causes inventory to switch from recent to my inventory tab 2023-10-11 21:22:30 +02:00
Andrey Kleshchev 7d50a51434 Merge branch 'main' (DRTVWR-567) into DRTVWR-559
# 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-10-03 19:00:33 +03:00
Andrey Kleshchev 627a6a2d0f SL-20332 Crash at dragCategoryIntoFolder 2023-09-25 20:17:06 +03:00
Andrey Kleshchev b5c745185f SL-20162 Option for debuging folder version in UI
Shows folder's data instead of a suffix.
Will need either a new inventory window or to toggle UI debug on early.
2023-09-12 19:51:13 +03:00
Andrey Kleshchev 992d4ec36f SL-19826 Implement feedback for dropping into flat folder view Part#2 2023-09-10 21:48:43 +03:00
Andrey Kleshchev 6675321e6a SL-19826 Implement feedback for pasting into flat folder view Part#1 2023-09-10 21:48:43 +03:00
Maxim Nikolenko c24849f9da SL-19912 allow drag-n-drop items from Object's content to the Gallery 2023-06-23 12:48:57 +03:00
Andrey Kleshchev b721d20ea9 SL-19686 Slight menu optimization
Add and Replace elements aren't displayed for system folders yet take a while to look for worn items through whole inventory.
2023-06-19 21:31:21 +03:00
Andrey Kleshchev f608eafc37 SL-19496 Fix attempts to open trash for thumnail assigment do not work. 2023-06-16 22:43:10 +03:00
Maxim Nikolenko 3a35922456 SL-19867 'Open in new window' option is missing for 'Trash' and 'Current Outfit' folders 2023-06-14 16:24:56 +03:00
Andrey Kleshchev bc67a7445c SL-19823 Fix active panel not existing 2023-06-12 23:01:57 +03:00
Maxim Nikolenko 5c55adae47 SL-19773 add context menu for root folder in single folder mode 2023-05-30 13:10:36 +03:00
Maxim Nikolenko 5554686b91 SL-19544 WIP show item permissions after item name 2023-04-17 13:22:27 +03:00
Andrey Kleshchev 6306b1fa6e SL-19496 Thumbnail should be modifiable regardless of permissions 2023-03-31 22:07:19 +03:00
Andrey Kleshchev 0d068b0f30 SL-19479 Remove outfit photo preview and replace with a pop up 2023-03-29 22:56:48 +03:00
Maxim Nikolenko c10eed0818 SL-19379 WIP allow change search type for Gallery 2023-03-29 18:02:04 +03:00
Andrey Kleshchev 11b2f138ce SL-19502 Copying folders should copy thumbnails 2023-03-29 04:28:07 +03:00
Maxim Nikolenko d733ee60ea SL-19379 WIP add double-click attach action for objects; add icon link overlays 2023-03-24 12:56:57 +02:00
Maxim Nikolenko 24b41ee746 SL-19379 WIP basic drag and drop handling 2023-03-22 22:15:46 +02:00
Andrey Kleshchev 9ef9efaa0e SL-19108 Fix folders not showing thumbnails 2023-03-17 14:51:06 +02:00
Maxim Nikolenko 1699bdbea7 mac build fix 2023-03-11 14:05:00 +02:00
Andrey Kleshchev ff6ff01c6a SL-18629 Replacing UDP creation messages with callback based AIS 2023-03-10 19:32:47 +02:00
Andrey Kleshchev 811da7dbb1 SL-18629 WIP Replacing UDP creation messages with callback based AIS #2
findCategory and move_item_to_marketplacelistings
2023-03-10 19:32:47 +02:00
Andrey Kleshchev 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
Maxim Nikolenko f377e27f0b SL-19274 Add new double-click option to Inventory settings 2023-02-27 20:27:11 +02:00
Maxim Nikolenko 49da5288bd SL-19234 add Inventory settings floater 2023-02-24 03:17:53 +02:00
Maxim Nikolenko 7904649923 SL-19105 Update menu items; show items count on selection in single-folder mode 2023-02-22 20:29:01 +02:00
Andrey Kleshchev d6c0e40559 SL-19108 Enabled Image changing floater for folders 2023-02-21 17:53:52 +02:00
Andrey Kleshchev f2d46651b9 SL-19108 WIP Managing inventory thumbnail #2 2023-02-17 23:09:51 +02:00
Andrey Kleshchev ec02220f06 SL-19108 WIP Managing inventory thumbnail #1 2023-02-17 23:09:51 +02:00
Maxim Nikolenko 734b1b5d42 SL-19105 WIP Single-folder inventory view 2023-02-17 16:23:44 +02:00
Ansariel 90b272680e Re-enable properties menu option for inventory multi-selections 2023-02-14 01:00:17 +01:00
Andrey Kleshchev 1cc41cb9c4 SL-19134 Remove llfloaterproperties
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
2023-02-08 14:27:52 +02:00
Maxim Nikolenko 51142d1341 Merge branch 'main' into DRTVWR-567
# Conflicts:
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llpanelmaininventory.cpp
2023-02-03 16:53:33 +02:00
Brad Linden 5fabfa50d7 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-02-02 12:11:40 -08:00
Maxim Nikolenko db80fdb55b SL-19104 update label and permissions display 2023-02-01 23:57:36 +02:00
Maxim Nikolenko ac3f1b54ec
SL-19104 Clean up inventory UI to prepare for thumbnails (#66) 2023-02-01 18:44:26 +02:00
Andrey Kleshchev 999c8cd3b9 SL-19117 Textures should return asset id when thumbnail is not set 2023-02-01 16:38:47 +02:00
Andrey Kleshchev b3201e75b1 SL-18945 Links have no 'cut' option
Links can be drag and dropped so they should be movable via 'cut' as well
2023-01-11 16:03:33 +02:00
Andrey Kleshchev 007939f0a7 SL-18939 Cannot copy inventory folders with copiable links 2023-01-11 08:30:32 +02:00
Brad Linden eb526fec0a Merge remote-tracking branch 'origin/main' into DRTVWR-559 2022-12-12 17:59:34 -08:00
Andrey Kleshchev 24fb2f8336 Merge branch 'master' (DRTVWR-548) into DRTVWR-559
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Andrey Lihatskiy 4aaa686a2d SL-18353 Don't allow "Ungroup folder items" on outfit folders 2022-10-20 02:16:02 +03:00
Andrey Kleshchev 7649114588 Merge branch master (DRTVWR-571) into DRTVWR-559
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Andrey Kleshchev c118c27623 SL-18117 Smarter add and detach inventory menus
The 'exceptions' solution is a bit ugly, but alternative is remaking all inventory and chat menus to act based on registars
2022-09-10 00:57:39 +03:00