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
f24f72d2f9
SL-19826 Gallery multiselect support Part#3
...
wip
2023-09-10 21:48:43 +03:00
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
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
a520340900
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llsidepanelinventory.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
2023-07-04 14:42:05 +02:00
924869900a
SL-19938 Make sure marketplace removes empty folder it automatically moved items from
...
when folder was recreated into stock fodler
2023-06-30 01:53:39 +03:00
fb62ef1210
SL-19932 FIXED Drag and drop or paste of new item in existing marketplace entry does not work
2023-06-29 13:14:40 +03:00
23cf219d4a
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-06-12 18:46:25 +02:00
5c6a2779c4
SL-19826 Pasting folders in Single folder should highlight pasted folder
2023-06-09 22:04:52 +03:00
f8823a4263
SL-19845 show delete confirmation at least once per session
2023-06-08 23:25:12 +03:00
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
5c55adae47
SL-19773 add context menu for root folder in single folder mode
2023-05-30 13:10:36 +03:00
9b93864eb9
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llstartup.cpp
# indra/newview/llurldispatcher.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-04-21 14:22:42 +02:00
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
ebbc09551a
SL-19036: Extra folder is created after dragging the inventory folder
2023-04-12 21:03:07 +02:00
4ce1e68ccb
SL-19529 Marketplace validation improvements
2023-04-08 15:13:13 +03:00
d33328584f
SL-19529 Fix uninitialized variable and calback counter
2023-04-08 02:56:34 +03:00
0d12b5f637
SL-19529 MacOS build fix
2023-04-06 02:36:16 +03:00
fe695f3db2
SL-19529 Marketplace version folders not created
2023-04-06 01:53:34 +03:00
ae3e366215
SL-19379 WIP update gear menu with Gallery items
2023-03-30 21:40:19 +03:00
c93d5fc64c
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
2023-03-30 14:54:52 +02:00
49c8ce2b07
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-30 14:53:12 +02:00
198cd4df09
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-30 14:09:50 +03:00
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
c10eed0818
SL-19379 WIP allow change search type for Gallery
2023-03-29 18:02:04 +03:00
e5b8b799cc
SL-19379 WIP add basic context menu
2023-03-29 13:51:40 +03:00
11b2f138ce
SL-19502 Copying folders should copy thumbnails
2023-03-29 04:28:07 +03:00
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
3605d3164d
SL-19379 WIP show localized folder names in Gallery
2023-03-24 13:58:29 +02:00
24b41ee746
SL-19379 WIP basic drag and drop handling
2023-03-22 22:15:46 +02:00
1eab324711
SL-19379 WIP Gallery view Inventory: first pass
2023-03-21 17:47:26 +02:00
b68a674910
SL-18629 Load cof only once links are ready
2023-03-20 23:39:30 +02:00
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
1699bdbea7
mac build fix
2023-03-11 14:05:00 +02:00
ff6ff01c6a
SL-18629 Replacing UDP creation messages with callback based AIS
2023-03-10 19:32:47 +02:00
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
a777a0b27e
SL-18629 WIP Replacing UDP creation messages with callback based AIS
2023-03-10 19:32:47 +02:00
e364b90d61
SL-19335 Switching view (using the switch button) should select appropriate folder
2023-03-10 17:39:24 +02:00
d9e2115374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-07 12:47:54 +01:00
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
1288a6cd44
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-24 14:32:29 +01:00
49da5288bd
SL-19234 add Inventory settings floater
2023-02-24 03:17:53 +02:00
69a01606c1
FIRE-32736: Add confirmation before ungrouping folder
2023-02-17 15:24:31 +01:00
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
4bc9331ddd
SL-19140 Fix contribution doc
2023-02-14 18:04:46 +02:00
c5a3c97b6b
Add multi item properties floater support
2023-02-14 00:40:01 +01:00
09f24c4ffd
Add multi item properties floater support for new item properties
2023-02-14 00:28:40 +01:00
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
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
c9ba8f1fce
SL-19109 Decouple object profiles from inventory
...
Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
2023-02-03 23:56:35 +02:00
Ansariel