Maxim Nikolenko
|
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 |
|
Andrey Lihatskiy
|
dca3c83cd9
|
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
|
2023-03-20 01:23:16 +02:00 |
|
Andrey Kleshchev
|
4bc9331ddd
|
SL-19140 Fix contribution doc
|
2023-02-14 18:04:46 +02: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 |
|
Andrey Lihatskiy
|
b2e3a07ab4
|
SL-18988 Updated contributions.txt
|
2023-02-01 16:38:47 +02:00 |
|
Callum Prentice
|
f7838ca17c
|
Merge branch 'main' into DRTVWR-568
|
2022-12-12 11:13:10 -08: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 |
|
Andrey Lihatskiy
|
b4dd4271a1
|
SL-16874 Added tool tips to buttons displayed by llDialog()
|
2022-12-12 20:22:50 +02:00 |
|
Andrey Lihatskiy
|
25c62f554f
|
Merge branch 'master' into DRTVWR-570-maint-Q
|
2022-11-21 22:46:35 +02:00 |
|
Andrey Kleshchev
|
96f0c95898
|
Merge branch master into DRTVWR-565-maint-P
|
2022-11-21 20:48:24 +02:00 |
|
Kyler Eastridge
|
35d2771cd3
|
Fix spelling error on license file name
|
2022-11-18 06:23:11 -05:00 |
|
Kyler Eastridge
|
4a33a0edb2
|
Fix readme logo for dark theme sites
|
2022-11-18 06:22:43 -05:00 |
|
Andrey Lihatskiy
|
24993a914f
|
SL-18637 Reverted material shader changes
original fix by Beq Janus
|
2022-11-14 23:58:14 +02:00 |
|
Andrey Lihatskiy
|
55c27641fe
|
Merge remote-tracking branch 'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q
|
2022-11-09 00:45:01 +02:00 |
|
Andrey Lihatskiy
|
2904062948
|
Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q
|
2022-11-09 00:41:58 +02:00 |
|
Andrey Lihatskiy
|
67ce0e77d7
|
Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-Q
|
2022-11-02 18:50:18 +02:00 |
|
Andrey Lihatskiy
|
39e08b34b1
|
Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q
|
2022-11-01 23:11:57 +02:00 |
|
Andrey Lihatskiy
|
d4d5d4018d
|
Merge remote-tracking branch 'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q
|
2022-10-29 00:32:59 +03:00 |
|
Andrey Lihatskiy
|
b8f75bd161
|
Merge branch 'master' into DRTVWR-570-maint-Q
|
2022-10-26 23:58:06 +03:00 |
|
Callum Linden
|
aad3b32a92
|
Merge branch 'master' into DRTVWR-568
|
2022-10-26 12:07:12 -07:00 |
|
Callum Linden
|
80585d56fd
|
Merge master into DRTVWR-568 (and fix conflicts)
|
2022-10-24 17:48:16 -07:00 |
|
Andrey Lihatskiy
|
439aa79414
|
SL-18432 Fix for alpha sorting
|
2022-10-24 22:14:20 +03:00 |
|
Andrey Lihatskiy
|
e0ace0c722
|
Merge branch 'master' into DRTVWR-570-maint-Q
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
|
2022-10-20 22:34:11 +03:00 |
|
Andrey Lihatskiy
|
f0cd5407c4
|
SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into DRTVWR-570-maint-Q
|
2022-10-19 23:53:53 +03:00 |
|
Mnikolenko Productengine
|
dbbc710739
|
SL-18348 FIXED Include next/previous face doesn't work
|
2022-10-13 14:39:29 +03:00 |
|
Andrey Kleshchev
|
338aeef7e9
|
SL-14696 SL-13629 Re-add gradation fix after merging a contribution
|
2022-10-01 00:48:25 +03:00 |
|
Andrey Kleshchev
|
6614a6ee99
|
SL-18249 Optimizations to mesh and material loading
|
2022-09-28 18:42:10 +03:00 |
|
Andrey Kleshchev
|
9bad5d08fb
|
SL-17238 Large cmake contribution by NickyD
|
2022-09-17 19:30:31 +03:00 |
|
Andrey Lihatskiy
|
a9a63db0f0
|
Merge branch 'master' into DRTVWR-548-maint-N
|
2022-08-31 00:17:37 +03:00 |
|
Andrey Lihatskiy
|
2e837e5389
|
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
|
2022-06-29 20:51:08 +03:00 |
|
Andrey Kleshchev
|
1b369c7f10
|
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
2022-06-29 18:30:05 +03:00 |
|
Maxim Nikolenko
|
1167ea994c
|
SL-17634 Replace deprecated carbon Gestalt calls
|
2022-06-22 18:00:49 +03:00 |
|
Andrey Kleshchev
|
791b7ff0e9
|
SL-17585 Don't bother users with dialogs if we are already quiting
|
2022-06-20 17:07:49 +03:00 |
|
Andrey Lihatskiy
|
3da7a50b71
|
Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
|
2022-05-27 02:51:33 +03:00 |
|
Andrey Lihatskiy
|
2ed401882e
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
2022-05-26 02:56:29 +03:00 |
|
Nat Goodspeed
|
4e282db26b
|
SL-17218: Credit NickyD's contributions to this Jira.
|
2022-04-14 15:32:19 -04:00 |
|
Andrey Kleshchev
|
51e318fd8d
|
SL-14541 Pull in updated zlib-ng
Nicky Dasmijn's contribution for zlib-ng Linux builds
|
2022-03-05 11:34:13 +02:00 |
|
Andrey Kleshchev
|
97a103255e
|
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
|
2022-03-01 13:41:42 +02:00 |
|
Andrey Lihatskiy
|
e70fe3a50d
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewermenu.cpp
|
2022-02-28 22:01:18 +02:00 |
|
Andrey Lihatskiy
|
0bef5e553e
|
Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects"
This reverts commit 8215fff0c2.
# Conflicts:
# indra/newview/lltoolpie.cpp
|
2022-01-21 19:13:28 +02:00 |
|
Andrey Lihatskiy
|
469ce7f7f6
|
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
|
2022-01-10 23:51:52 +02:00 |
|
Andrey Lihatskiy
|
b33e18585d
|
Merge branch 'master' into DRTVWR-483
|
2021-12-26 14:00:00 +02:00 |
|
Dave Houlton
|
cf35d27dfb
|
DRTVWR-546 merge up to 6.5.2
|
2021-12-15 14:37:18 -07:00 |
|
Andrey Lihatskiy
|
edb6293528
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-12-15 21:50:40 +02:00 |
|
Andrey Kleshchev
|
7c1cd47772
|
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
|
2021-12-15 21:16:47 +02:00 |
|
Andrey Kleshchev
|
442abdaac7
|
SL-16438 Machine id for Linux is always 0
|
2021-12-03 00:49:33 +02:00 |
|
Dave Houlton
|
353329c2c2
|
DRTVWR-546 merge in master v6.5.1
|
2021-11-16 11:44:55 -07:00 |
|
Andrey Lihatskiy
|
981cdca0a5
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/llui/lltextbase.h
# indra/newview/VIEWER_VERSION.txt
|
2021-11-16 01:34:29 +02:00 |
|
Andrey Lihatskiy
|
0bffd3d365
|
Merge branch 'master' into DRTVWR-519
# Conflicts:
# README.md
|
2021-11-16 01:21:05 +02:00 |
|
Andrey Lihatskiy
|
30c381406c
|
Merge branch 'master' into DRTVWR-530-maint
# Conflicts:
# doc/contributions.txt
|
2021-11-16 01:09:11 +02:00 |