Beq
|
dedee8ba50
|
initial merge form DRTVWR-539 branch
|
2022-11-02 22:37:24 +00:00 |
|
Mnikolenko Productengine
|
0aabcf9a85
|
Merge branch 'master' into DRTVWR-539
|
2022-10-27 14:23:42 +03:00 |
|
Ansariel
|
8b2b11d4a0
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
|
2022-10-26 20:42:44 +02:00 |
|
Andrey Lihatskiy
|
439aa79414
|
SL-18432 Fix for alpha sorting
|
2022-10-24 22:14:20 +03:00 |
|
Mnikolenko Productengine
|
717b34f53f
|
Merge branch 'master' into DRTVWR-539
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
|
2022-10-21 14:42:53 +03:00 |
|
Mnikolenko Productengine
|
198420f9f6
|
SL-18248 Move frame breakdown stats to 'Scene loading statistics' floater
|
2022-09-28 14:16:16 +03:00 |
|
Ansariel
|
55f51f4829
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-31 17:02:33 +02:00 |
|
Andrey Lihatskiy
|
a9a63db0f0
|
Merge branch 'master' into DRTVWR-548-maint-N
|
2022-08-31 00:17:37 +03:00 |
|
Ansariel
|
2c0edbac18
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
|
2022-06-29 22:04:20 +02: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 |
|
Ansariel
|
1fbfe48f84
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
|
2022-06-29 18:23:17 +02: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 |
|
Ansariel
|
cfb6c083fe
|
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/llfilesystem/lldiskcache.cpp
# indra/llwindow/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
|
2022-06-24 22:18:44 +02:00 |
|
Ansariel
|
6259666be0
|
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
|
2022-06-22 21:11:47 +02: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 |
|
Ansariel
|
6ccdf5545d
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
# Conflicts:
# autobuild.xml
# 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 11:41:45 +02: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 |
|
Ansariel
|
b61dfd131d
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-05-26 11:36:16 +02:00 |
|
Andrey Lihatskiy
|
2ed401882e
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
2022-05-26 02:56:29 +03:00 |
|
Ansariel
|
c1a4be7dae
|
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
|
2022-04-19 13:21:52 +02: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 |
|
Ansariel
|
455b750cde
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/llviewermenu.cpp
|
2022-03-02 12:04:09 +01:00 |
|
Ansariel
|
ef88337eef
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# 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-02 10:12:19 +01: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 |
|
Ansariel
|
828fbdc571
|
Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer
|
2022-02-02 10:37:33 +01: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 |
|
Ansariel
|
95db09d8d0
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
|
2022-01-10 23:31:49 +01: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 |
|
Ansariel
|
f19311bf7a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-12-20 12:45:10 +01:00 |
|
Ansariel
|
496156073b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-12-16 18:56:31 +01:00 |
|
Ansariel
|
2ba4a164e2
|
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/Python.cmake
# indra/lib/python/indra/util/llmanifest.py
# indra/lib/python/indra/util/test_win32_manifest.py
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcommon/llerror.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lleventnotifier.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewanim.h
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/de/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ru/menu_place_add_button.xml
# indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
# indra/newview/viewer_manifest.py
|
2021-12-16 12:32:34 +01:00 |
|
Ansariel
|
39f272278c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp
|
2021-12-16 10:20:56 +01:00 |
|
Ansariel
|
6663bc6f85
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# autobuild.xml
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llviewercontrol.cpp
|
2021-12-16 09:49:35 +01: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 |
|
Ansariel
|
30ad27c027
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
|
2021-11-16 21:09:53 +01:00 |
|
Ansariel
|
c2f8517118
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 21:01:05 +01:00 |
|
Dave Houlton
|
353329c2c2
|
DRTVWR-546 merge in master v6.5.1
|
2021-11-16 11:44:55 -07:00 |
|
Ansariel
|
969762f162
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 16:29:50 +01:00 |
|
Ansariel
|
f00647b6fd
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 15:38:25 +01:00 |
|
Ansariel
|
be25e64888
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 13:54:22 +01:00 |
|
Ansariel
|
627eecd577
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 08:22:59 +01: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 |