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
|
51142d1341
|
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llpanelmaininventory.cpp
|
2023-02-03 16:53:33 +02:00 |
|
Maxim Nikolenko
|
ac3f1b54ec
|
SL-19104 Clean up inventory UI to prepare for thumbnails (#66)
|
2023-02-01 18:44:26 +02:00 |
|
Ansariel
|
8f45ad9323
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-11-22 16:29:17 +01:00 |
|
Zi Ree
|
a5df39feb1
|
FIRE-31369: Add inventory filter for coalesced objects
|
2022-11-15 19:01:46 +01:00 |
|
Ansariel
|
a9c29b4b81
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmenugl.h
# indra/llui/lltexteditor.cpp
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llnetmap.cpp
|
2022-10-20 10:51:25 +02:00 |
|
Rye Mutt
|
b9552e596f
|
Reduce folderview menu bloat via lazy creation on right click
|
2022-10-19 16:21:05 -04:00 |
|
Ansariel
|
1ffbc0fefe
|
Revert "Don't store inventory sort order in filters.xml file - LLParamSDParser stumbles over this which was probably the reason the sort order is stored in settings.xml anyways"
This reverts commit 903a9fcdc6.
|
2022-06-03 18:32:52 +02:00 |
|
Ansariel
|
903a9fcdc6
|
Don't store inventory sort order in filters.xml file - LLParamSDParser stumbles over this which was probably the reason the sort order is stored in settings.xml anyways
|
2022-05-21 16:37:16 +02:00 |
|
Ansariel
|
f00647b6fd
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 15:38:25 +01:00 |
|
Andrey Lihatskiy
|
f9373a9b4e
|
Merge branch 'master' into DRTVWR-527-maint
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
|
2021-11-16 00:54:53 +02:00 |
|
Ansariel
|
0c23720e73
|
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-10-12 12:47:04 +02:00 |
|
Andrey Kleshchev
|
81e68e78a1
|
SL-16120 Links are not shown in Inventory's 'Recent' tab
Revert "SL-13459 Don't show links in Inventory's 'Recent' tab"
This reverts commit 7e3a65caec.
|
2021-10-06 21:07:26 +03:00 |
|
Ansariel
|
7b5f815b94
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-06-27 15:01:27 +02:00 |
|
Andrey Lihatskiy
|
7f19c512c9
|
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# indra/newview/app_settings/settings.xml
|
2021-06-25 00:54:35 +03:00 |
|
Ansariel
|
c2addaf78e
|
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
|
2021-04-22 08:15:41 +02:00 |
|
Mnikolenko Productengine
|
2c88c74276
|
Revert "SL-12475 add Inventory Favorites tab"
|
2021-04-21 12:12:04 +03:00 |
|
Ansariel
|
2ff2a32cfc
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-03-03 23:40:00 +01:00 |
|
Ansariel
|
fc9bedbe78
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-03-03 10:39:48 +01:00 |
|
Zi Ree
|
763709b101
|
FIRE-1175 - Filter Permissions Menu, fix filtered folders not hiding
|
2021-02-21 22:15:54 +01:00 |
|
Ansariel
|
23693c23a7
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-03 23:50:45 +01:00 |
|
Ansariel
|
160d874a9c
|
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llui/llchat.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llviewerinventory.cpp
|
2021-02-03 22:09:42 +01:00 |
|
Ansariel
|
bdfa92fb91
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-03 19:50:18 +01:00 |
|
Andrey Lihatskiy
|
f047e2236c
|
Merge branch 'master' into DRTVWR-522-maint
|
2021-02-01 22:14:56 +02:00 |
|
Andrey Lihatskiy
|
2cf9c01175
|
Merge branch 'master' into DRTVWR-518-ui
|
2021-02-01 22:11:35 +02:00 |
|
Ansariel
|
339c3c5df4
|
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-01-18 18:55:37 +01:00 |
|
Ansariel
|
52b3bb404c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-01-17 12:38:03 +01:00 |
|
PanteraPolnocy
|
e4a3fd79bf
|
FIRE-30628 [EEP] Inventory filter lacks Settings inventory object type in pulldown
|
2020-12-21 17:09:03 +01:00 |
|
Mnikolenko Productengine
|
6ec194154b
|
SL-13826 Show result of "Find original" and "Show original" in Main Inventory floater and reset the filters to guarantee success
|
2020-12-10 17:43:21 +02:00 |
|
Mnikolenko Productengine
|
1884da366d
|
SL-1777 FIXED Uploading Image or Saving Snapshot while in Inventory Recent tab jumps to Main tab
|
2020-12-07 17:37:20 +02:00 |
|
Ansariel
|
bd14ef42b3
|
FIRE-30495: Revert commit 3df26d1e24 because it's 2020 and internationalization is still a thing...
|
2020-11-17 01:22:46 +01:00 |
|
Ansariel
|
3df26d1e24
|
After discussion with Nicky: Use user's locale from OS if using system default language, otherwise use locale configured in particular language_settings.xml file
|
2020-11-15 10:58:06 +01:00 |
|
Ansariel
|
c7fa67a466
|
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer (and undo "Find/Show Original" opening a new inventory window)
|
2020-11-12 20:04:54 +01:00 |
|
Mnikolenko Productengine
|
b484a27365
|
SL-13826 Open a new inventory floater for "Find original" and "Show original" result
|
2020-11-04 18:53:56 +02:00 |
|
Ansariel
|
951a99e929
|
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
|
2020-09-29 12:25:28 +02:00 |
|
Mnikolenko Productengine
|
3c38145852
|
SL-14001 New Inventory search visibility options should persist from login to login
|
2020-09-24 19:06:58 +03:00 |
|
Ansariel
|
b677e01629
|
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
|
2020-09-23 19:02:19 +02:00 |
|
Mnikolenko Productengine
|
b8c5f35a90
|
SL-13852 Show menu below the button
|
2020-09-23 11:32:26 +03:00 |
|
Mnikolenko Productengine
|
bc07bc526c
|
SL-13852 Add visibility options to inventory search results
|
2020-09-23 11:32:14 +03:00 |
|
Ansariel
|
fe10f171d3
|
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llmessage/llcoproceduremanager.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/strings.xml
|
2020-09-09 19:34:33 +02:00 |
|
Andrey Lihatskiy
|
d50131c0ac
|
Revert "SL-12475 add Inventory Favorites tab"
This reverts commit 92499ce1b4.
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
|
2020-09-09 01:22:18 +03:00 |
|
maxim_productengine
|
42e1a9ed87
|
SL-12475 add Inventory Favorites tab
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
|
2020-09-09 00:44:24 +03:00 |
|
Ansariel
|
e40b95154f
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-08-11 20:46:51 +02:00 |
|
Ansariel
|
d5dd2c8aeb
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
|
2020-08-11 19:52:44 +02:00 |
|
Ansariel
|
4f3271f028
|
FIRE-29977: Previous changes would lead to hilarious "OS$free" display - assume OS users are smart enough to comprehend "OS$ 0" means it's free
|
2020-08-05 16:33:31 +02:00 |
|
Ansariel
|
1b78cb7123
|
FIRE-29977: Upload menu in inventory shows double currency symbol
|
2020-08-05 14:32:19 +02:00 |
|
Ansariel
|
81c8cc4510
|
Undo nonsense change and keep showing links in "Recent" inventory panel
|
2020-07-09 10:18:22 +02:00 |
|
Ansariel
|
187b1e0d6e
|
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/llpanelpermissions.cpp
# indra/newview/llviewerregion.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_attachment_self.xml
# indra/newview/skins/default/xui/en/menu_avatar_self.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2020-07-09 10:08:42 +02:00 |
|
Mnikolenko Productengine
|
7e3a65caec
|
SL-13459 Don't show links in Inventory's 'Recent' tab
|
2020-07-06 17:48:25 +03:00 |
|
Ansariel
|
6afd505fa8
|
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-05-05 15:24:10 +02:00 |