Dave Houlton
|
353329c2c2
|
DRTVWR-546 merge in master v6.5.1
|
2021-11-16 11:44:55 -07:00 |
|
Mnikolenko Productengine
|
6ecf8f2c01
|
SL-16184 FIXED Frame stall when friend comes online.
|
2021-10-20 14:53:55 +03:00 |
|
Andrey Lihatskiy
|
6c8e6f033b
|
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
|
2021-07-20 02:48:05 +03:00 |
|
Mnikolenko Productengine
|
66793abc71
|
SL-14075 allow exporting multiple textures with the same name
|
2021-07-02 16:11:39 +03:00 |
|
Andrey Lihatskiy
|
293272c2c7
|
Merge branch 'master' into DRTVWR-521-maint
|
2021-06-25 00:52:03 +03:00 |
|
Andrey Lihatskiy
|
a4c6c7059f
|
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
|
2021-06-25 00:51:02 +03:00 |
|
Mnikolenko Productengine
|
2c88c74276
|
Revert "SL-12475 add Inventory Favorites tab"
|
2021-04-21 12:12:04 +03:00 |
|
Mnikolenko Productengine
|
b1fad32e8b
|
Revert "SL-14633 FIXED The item from the favorite tab in the inventory floater can be purged"
|
2021-04-21 12:08:24 +03:00 |
|
Andrey Kleshchev
|
56eda0385e
|
SL-13395 Allow creating outfit folders under My Outfits
|
2021-04-16 20:37:02 +03:00 |
|
Andrey Kleshchev
|
14826e17dc
|
SL-14654 [EEP] Aplying settings locally now is instant
The 1 second fade makes it harder to compare different settings.
|
2021-02-25 23:48:48 +02:00 |
|
Mnikolenko Productengine
|
5bdc96784c
|
SL-12475 Add the way to reset current Favorites folders
|
2021-02-23 18:41:15 +02:00 |
|
Andrey Kleshchev
|
18717562ee
|
SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5
|
2021-02-19 00:05:52 +02: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
|
1087c26de7
|
SL-14633 FIXED The item from the favorite tab in the inventory floater can be purged
|
2021-01-06 12:08:21 +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 |
|
Andrey Kleshchev
|
46ebe69f32
|
SL-14303 Fix LLWearableType to not spam in logs
|
2020-11-10 18:18:51 +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 |
|
Andrey Kleshchev
|
131996176f
|
SL-14078 Small optimization
|
2020-10-12 22:53:36 +03:00 |
|
Andrey Kleshchev
|
1edd38e742
|
SL-14078 Maked couple functions as const
|
2020-10-12 18:35:34 +03:00 |
|
Andrey Lihatskiy
|
32cb17e3bb
|
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# indra/newview/llgroupmgr.cpp
|
2020-09-28 22:24:12 +03:00 |
|
Andrey Lihatskiy
|
825cfc2b6a
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
|
2020-09-22 23:30:12 +03: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 |
|
Mnikolenko Productengine
|
b95d780b2e
|
SL-13457 FIXED Crash in LLFolderViewGroupedItemBridge::canWearSelected
|
2020-06-15 16:07:05 +03:00 |
|
Mnikolenko Productengine
|
353afb48f2
|
SL-13239 Add 'Touch' to the various attachment context menus
|
2020-05-28 18:38:01 +03:00 |
|
Mnikolenko Productengine
|
ae24afec8f
|
SL-13190 Allow Edit Attached Object Position From Inventory
|
2020-05-22 14:37:14 +03:00 |
|
Andrey Lihatskiy
|
ec9b989863
|
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
|
2020-05-05 00:37:16 +03:00 |
|
Andrey Lihatskiy
|
c757c29c95
|
Merge branch 'master' into DRTVWR-500
# Conflicts:
# indra/newview/pipeline.cpp
|
2020-04-20 21:23:34 +03:00 |
|
Dave Houlton
|
7674c00fb9
|
Merge master (v 6.3.8) into DRTVWR-440
|
2020-02-21 12:05:46 -07:00 |
|
maxim_productengine
|
92499ce1b4
|
SL-12475 add Inventory Favorites tab
|
2020-01-27 17:54:02 +02:00 |
|
Dave Houlton
|
f61a5c4642
|
Merge viewer-release 6.3.6 into viewwer-eep repo
|
2019-12-16 12:47:19 -07:00 |
|
andreykproductengine
|
43809e1c5c
|
SL-12180 Crash on requestOfflineMessagesCoro
|
2019-10-23 22:37:59 +03:00 |
|
Brad Payne (Vir Linden)
|
c7747d2a1b
|
merge
|
2019-10-16 22:24:03 +01:00 |
|
Graham Linden
|
3609eabe54
|
Merge viewer-release 6.3.2
|
2019-09-10 12:07:01 -07:00 |
|
AndreyL ProductEngine
|
3631057bfa
|
Line endings fix
|
2019-10-17 21:58:18 +03:00 |
|
Mnikolenko Productengine
|
aab8ea7236
|
SL-12121 FIXED Unable to delete folders from 'Marketplace listings'
|
2019-10-17 19:15:02 +03:00 |
|
Rider Linden
|
1f656735d3
|
SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.
|
2019-08-26 11:43:45 -07:00 |
|
andreykproductengine
|
0277bc7af7
|
SL-11645 Replacing outfit from an object leaves one item unworn
|
2019-07-24 16:56:17 +03:00 |
|
andreykproductengine
|
1f1b51c7ce
|
SL-11361 Moving folder to My Outfits should create an outfit
|
2019-06-14 20:27:39 +03:00 |
|
maxim_productengine
|
618446f8df
|
SL-11324 FIXED Accidental deletion of Marketplace Listings folder possible
|
2019-05-31 18:10:50 +03:00 |
|
Graham Linden
|
605c9c1966
|
Fix merge fail.
|
2019-05-08 11:42:31 -07:00 |
|
Graham Linden
|
470d1595cc
|
Merge viewer-release
|
2019-05-08 09:30:39 -07:00 |
|
AndreyL ProductEngine
|
5e5c5ca09c
|
Merged SL-10400 and SL-10401
|
2019-04-26 21:02:00 +03:00 |
|
Brad Payne (Vir Linden)
|
099e58f75b
|
SL-10401 - get agent attachment limit from SimulatorFeatures if available
|
2019-04-23 15:13:38 +01:00 |
|
andreykproductengine
|
d903f8c1a1
|
SL-10470 Fixed freeze due to extensive logging
|
2019-02-05 16:14:27 +02:00 |