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
|
505c15cf47
|
SL-19759 FIXED Adding New Folders in Single Folder view can cause all folders to open and shift out of view
|
2023-05-23 16:13:10 +03:00 |
|
Andrey Kleshchev
|
706d8f1727
|
SL-19732 Fix folder's thumbnail from sticking over folder's content
|
2023-05-18 22:22:16 +03:00 |
|
Ansariel
|
63df00d4e5
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/lllayoutstack.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelwearing.h
# indra/newview/llviewermessage.cpp
|
2023-05-17 20:35:53 +02:00 |
|
Maxim Nikolenko
|
474012abd6
|
SL-19686 reduce delay when switching between folders
|
2023-05-16 18:03:57 +03: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 |
|
Maxim Nikolenko
|
3c54d6a037
|
SL-19386 Double click to open Single folder view should affect only Inventory
|
2023-03-13 12:42:08 +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 |
|
Maxim Nikolenko
|
b142219667
|
SL-19288 Change item label suffix color to grey
|
2023-03-01 21:30:42 +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
|
734b1b5d42
|
SL-19105 WIP Single-folder inventory view
|
2023-02-17 16:23:44 +02: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 |
|
Maxim Nikolenko
|
2d6edb088e
|
SL-19149 Highlight string match is misplaced when searching worn items
|
2023-02-03 22:22:11 +02:00 |
|
Maxim Nikolenko
|
db80fdb55b
|
SL-19104 update label and permissions display
|
2023-02-01 23:57:36 +02:00 |
|
Kitty Barnett
|
1140ae3489
|
Add a texture inspector and show it when hovering over an inventory textory (or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
|
2023-02-01 16:38:47 +02:00 |
|
Ansariel
|
2253723705
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-07-21 14:13:23 +02:00 |
|
Andrey Lihatskiy
|
9873e7bba9
|
Merge branch 'master' into DRTVWR-527-maint
|
2021-07-19 22:22:32 +03:00 |
|
Ansariel
|
885215519d
|
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-04-12 11:56:45 +02:00 |
|
Ansariel
|
db72dc7d0f
|
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-04-02 19:33:18 +02:00 |
|
Andrey Kleshchev
|
7ddbf118f5
|
SL-13182 Split buildNewViews over frames
|
2021-04-01 23:06:44 +03:00 |
|
Andrey Kleshchev
|
65352e9884
|
SL-14927 Some avatar names not resolving in chat
|
2021-03-19 13:47:32 +02:00 |
|
Andrey Kleshchev
|
5f6a025397
|
Revert "SL-14927 Some avatar names not resolving in chat"
This reverts commit a66932a091.
|
2021-03-19 13:40:19 +02:00 |
|
Andrey Kleshchev
|
a66932a091
|
SL-14927 Some avatar names not resolving in chat
buildConversationViewParticipant() was deparenting view models that belong to session
|
2021-03-19 13:22:05 +02:00 |
|
Andrey Lihatskiy
|
fb1238a1ce
|
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.cpp
# indra/newview/llenvironment.cpp
|
2020-11-13 18:26:56 +02:00 |
|
Ansariel
|
caf7f6c1d2
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 17:53:39 +01:00 |
|
Ansariel
|
a4f2801b91
|
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-10-15 13:52:10 +02:00 |
|
Mnikolenko Productengine
|
0b395f01f9
|
SL-13570 FIXED The name of the item is overlapped by search term in inventory
|
2020-09-30 14:25:21 +03:00 |
|
Ansariel
|
0007ff2660
|
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-05-07 12:29:58 +02:00 |
|
Andrey Kleshchev
|
8576eaa3bf
|
SL-13119 Fixed label updates
|
2020-05-07 00:07:29 +03:00 |
|
Andrey Kleshchev
|
59433e3132
|
SL-13119 Made control settings cached and fixed potential filtering issue
|
2020-04-30 16:32:16 +03:00 |
|
Andrey Kleshchev
|
d70b749101
|
SL-13119 Moved ineffective function from inventory view creation
|
2020-04-29 21:55:40 +03:00 |
|
Ansariel
|
dbf00cf036
|
Merge branch 'master'
|
2020-04-23 17:40:31 +02:00 |
|
Ansariel
|
22ac7edd6e
|
FIRE-20414 / FIRE-29342: Add option to protect folders from getting moved or deleted
|
2020-04-14 17:03:26 +02:00 |
|
Ansariel
|
0b6b4c7097
|
Merge Firestorm LGPL
|
2019-11-15 19:05:26 +01:00 |
|
Dave Houlton
|
dc1453af9c
|
Merge in from viewer-release 6.3.5
|
2019-11-13 16:46:27 -07:00 |
|
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +02:00 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +03:00 |
|
Ansariel
|
f8ad1551b3
|
Merge viewer-eep
|
2019-02-10 13:12:23 +01:00 |
|
andreykproductengine
|
c8d8414b3b
|
SL-10509 EEP Settings Picker gets closed by drag&drop
|
2019-02-08 19:06:20 +02:00 |
|
Tonya Souther
|
2e644b4911
|
Compile fixes for Xcode 9 (and probably gcc).
|
2018-01-27 02:02:16 -06:00 |
|
Ansariel
|
963e699a3c
|
Fix layout issue of inventory item bounding box if folder item height differs from default
|
2018-01-13 15:59:44 +01:00 |
|
Ansariel
|
4f0220e0fa
|
Slightly dim label suffixes in inventory and fix misleading color name on the way
|
2017-12-18 21:50:44 +01:00 |
|
Ansariel
|
2347b25808
|
Merge viewer-neko
|
2017-06-09 11:49:10 +02:00 |
|
Kitty Barnett
|
d7edeb2df8
|
STORM-2149: Add a warning notification when deleting a folder of filtered content
|
2017-06-02 16:44:00 +02:00 |
|
Ansariel
|
cb968152b0
|
Merge viewer-bear
|
2016-05-28 14:34:35 +02:00 |
|
Ansariel
|
ca98cd73db
|
Back out fix to prevent items going to trash during cut&paste - fix from LL is coming in next merge
|
2016-05-28 13:00:22 +02:00 |
|
andreykproductengine
|
f3507631ea
|
linux build fix
|
2016-05-26 18:26:43 +03:00 |
|
andreykproductengine
|
7d54c62016
|
MAINT-6397 cut items should not go to trash
|
2016-05-25 20:37:52 +03:00 |