Andrey Lihatskiy
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
Mnikolenko Productengine
752075d6d4
SL-18823 Restore fix after the merge
2023-01-13 19:47:24 +02:00
Andrey Lihatskiy
f9866a3543
Merge branch 'main' into DRTVWR-573-maint-R
...
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
2023-01-12 04:37:42 +02:00
Andrey Lihatskiy
f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
Maxim Nikolenko
94cc914947
SL-18823 FIXED Crash when using 'Create folder from selected'
2022-12-09 14:47:26 +02:00
Mnikolenko Productengine
9f7c22bbe5
SL-18810 FIXED "Find Original" doesn't work if Item profile was previously selected
2022-12-09 11:12:20 +02:00
Maxim Nikolenko
333786d2ba
SL-18644 reset 'All items' filter when using 'Find Original' in Recent tab
2022-11-17 17:21:37 +02:00
Mnikolenko Productengine
27f7edeedb
SL-16534 The link item is not updating after rezzing the linked object in-world
2022-10-28 19:55:40 +03:00
Andrey Lihatskiy
91f9f2e9f7
DRTVWR-570 Mac build fix: unused variables cleanup
2022-10-27 23:08:09 +03:00
Andrey Kleshchev
b2ad2f0645
SL-18297 A freeze while checking marketplace for errors
2022-10-06 22:42:49 +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
Mnikolenko Productengine
caa5b92fb7
SL-17665 additional checks to avoid moving protected folders
2022-07-11 16:46:19 +03:00
Mnikolenko Productengine
ed9dbabb5e
SL-17665 Add operation to create a subfolder from selected items in Inventory
2022-07-04 20:25:18 +03:00
Andrey Lihatskiy
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
Mnikolenko Productengine
66793abc71
SL-14075 allow exporting multiple textures with the same name
2021-07-02 16:11:39 +03:00
Andrey Lihatskiy
8b5fe507a4
Merge branch 'master' into DRTVWR-530-maint
2021-06-25 01:02:15 +03:00
Andrey Lihatskiy
293272c2c7
Merge branch 'master' into DRTVWR-521-maint
2021-06-25 00:52:03 +03:00
Mnikolenko Productengine
cb8b5f6ba6
SL-15223 FIXED "Reason: 'Not Found'" error message floater is shown when delete the unlisted listing folder
2021-05-17 17:14:52 +03:00
Mnikolenko Productengine
89b4611fc0
SL-15036 Add actions to move landmarks between tabs in the Places floater
2021-03-30 15:53:22 +03:00
Andrey Lihatskiy
185082f1bb
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# indra/newview/llappviewer.cpp
2021-02-01 22:14:44 +02:00
Andrey Lihatskiy
2cf9c01175
Merge branch 'master' into DRTVWR-518-ui
2021-02-01 22:11:35 +02: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
Andrey Lihatskiy
ac3db22abc
Merge branch 'master' into DRTVWR-518-ui
2020-11-13 18:27:29 +02:00
Andrey Kleshchev
92af5af736
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
2020-11-11 23:34:37 +02:00
Andrey Lihatskiy
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02: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
Mnikolenko Productengine
73303d9184
SL-14075 Allow bulk download of textures/pictures
2020-11-02 19:35:31 +02:00
Mnikolenko Productengine
39cf42e6eb
SL-13405 FIXED Preview Asset Types of Content tab in one window no longer works
2020-06-09 15:24:03 +03:00
Mnikolenko Productengine
ae24afec8f
SL-13190 Allow Edit Attached Object Position From Inventory
2020-05-22 14:37:14 +03:00
maxim_productengine
be0c609eaf
SL-11072 FIXED Crash in LLInventoryAction::doToSelected(2406)
2019-05-02 13:11:18 +03:00
maxim_productengine
edda833a35
MAINT-9039 Don't show environment editor floaters in multi-preview
2018-08-27 16:53:45 +03:00
maxim_productengine
7fc86d1a99
MAINT-8553 FIXED link is not copied from original folder in some cases
2018-05-22 13:42:15 +03:00
maxim_productengine
22a33cc8d7
fix line endings
2018-05-02 16:15:43 +03:00
maxim_productengine
46cc8496f0
MAINT-8553 Allow copy a link or copy a folder containing a link in inventory.
2018-05-02 12:24:14 +03:00
andreykproductengine
62390a7e0a
MAINT-8034 Folder depth was not counted correctly
2017-12-01 15:58:22 +02:00
andreykproductengine
9a7f1e782c
MAINT-7902 Fixed Opening Marketplace Listing before inventory has fetched unlists listings
2017-10-13 16:12:15 +03:00
Mnikolenko Productengine
9225439043
MAINT-7753 remove the warning for marketplace listings
2017-09-05 12:52:30 +03:00
AndreyL ProductEngine
2efa40fa60
MAINT-7356 Logic fix and cleanup
2017-07-21 05:29:51 +03: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
pavelkproductengine
735ae02583
MAINT-7356 Feature - Force item delete warning to prompt once per session
2017-05-30 20:35:05 +03:00
Ansariel
b59ac959fc
MAINT-6519 Contribution, adds feature to replace inventory links
2017-04-27 19:19:11 +02:00
Ansariel
420b1c9429
STORM-2141: Fix various inventory floater related issues:
...
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
2016-11-14 14:45:53 +01:00
AndreyL ProductEngine
b25a22a2c1
Merged in lindenlab/viewer-release
2016-05-19 23:02:37 +03:00
andreykproductengine
bb719baec5
MAINT-6352 FIXED Editing marketplace listings before inventory has fully fetched causes listings to be unlisted.
2016-04-21 16:16:16 +03:00
Oz Linden
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
Oz Linden
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
Oz Linden
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Rider Linden
9833a50260
MAINT-5754: For MoaP and MediaCtrls forward all events including KEYUP and KEYDOWN to the CEF plugin.
2015-10-27 15:17:12 -07:00
Rider Linden
53b947e039
Merge from viewer release.
2015-10-19 12:03:08 -07:00