Ansariel
|
bf8154d447
|
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llinventorypanel.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2023-10-12 19:36:34 +02: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 |
|
Ansariel
|
ce332e0755
|
Merge branch 'main' of https://github.com/secondlife/viewer
|
2023-10-04 02:44:58 +02:00 |
|
Andrey Kleshchev
|
627a6a2d0f
|
SL-20332 Crash at dragCategoryIntoFolder
|
2023-09-25 20:17:06 +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
|
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 |
|
Ansariel
|
a45c5826dc
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llvovolume.cpp
|
2023-09-12 14:20:54 +02: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 |
|
Ansariel
|
5ef0318270
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-08-31 18:35:52 +02:00 |
|
Ansariel
|
1a9a7d3b45
|
Add attachment point ID to "Attach to" menus (except HUD) to identify alpha sort order on rigged attachments
|
2023-08-29 00:51:21 +02:00 |
|
Ansariel
|
2b3c2400e8
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-08-09 11:15:37 +02:00 |
|
Ansariel
|
fb47a6394f
|
FIRE-33127: Made alphabetical sorting in "Attach to" menus optional
|
2023-08-04 17:57:15 +02:00 |
|
Ansariel
|
efcf81eb4a
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
|
2023-06-26 23:25:05 +02: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 |
|
Ansariel
|
147dc16bc5
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
|
2023-06-19 11:17:10 +02: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 |
|
Ansariel
|
6273fb827f
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.h
|
2023-05-31 12:02:06 +02:00 |
|
Maxim Nikolenko
|
5c55adae47
|
SL-19773 add context menu for root folder in single folder mode
|
2023-05-30 13:10:36 +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 |
|
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 |
|
Ansariel
|
49e7302d08
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llavataractions.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
|
2023-03-30 11:00:08 +02: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 |
|
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 |
|
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 |
|
Ansariel
|
2180c2a443
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/newview/app_settings/settings.xml
# indra/newview/llaisapi.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorymodel.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorymodelbackgroundfetch.h
# indra/newview/llsidepanelinventory.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
|
2023-03-20 18:15:38 +01: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 |
|
Ansariel
|
6895025a35
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/floater_my_inventory.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
|
2023-03-06 15:23:21 +01: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 |
|
Ansariel
|
61042ad1c7
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/newview/llappviewer.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_my_inventory.xml
# indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
|
2023-02-24 14:28:21 +01: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
|
998dc17eff
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llfloatermarketplacelistings.cpp
# indra/newview/llfloatermarketplacelistings.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/skins/default/colors.xml
# indra/newview/skins/default/xui/en/floater_snapshot.xml
|
2023-02-14 17:32:34 +01:00 |
|
Ansariel
|
90b272680e
|
Re-enable properties menu option for inventory multi-selections
|
2023-02-14 01:00:17 +01:00 |
|
Ansariel
|
2bc4fb2bf0
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.cpp
# indra/llui/llview.h
# indra/newview/llaisapi.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterproperties.cpp
# indra/newview/llfloaterproperties.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelmarketplaceinbox.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
# indra/newview/skins/default/xui/en/sidepanel_task_info.xml
# indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
|
2023-02-13 23:35:21 +01:00 |