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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
627eecd577
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 08:22:59 +01: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 |
|
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
|
790ead2ef2
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-541
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/lltracerecording.h
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2021-11-12 17:43:32 +01:00 |
|
Ansariel
|
63cc972499
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
|
2021-11-12 17:31:39 +01:00 |
|
Ansariel
|
7427b46ea5
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
|
2021-11-12 15:21:52 +01:00 |
|
Ansariel
|
02bc150a7f
|
Merge branch 'DRTVWR-541' of https://bitbucket.org/lindenlab/viewer
|
2021-10-28 12:47:09 +02:00 |
|
Ptolemy
|
ad91d0fd92
|
SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated
|
2021-10-27 10:05:13 -07:00 |
|
Ptolemy
|
32f46e17d3
|
SL-16027: Fix SL-15962 breaking Tracy OpenGL. Can now log memory + OpenGL in Tracy at the same time.
|
2021-10-15 16:13:06 -07:00 |
|
Beq
|
0911cae538
|
Initial merge of DRTVWR-541 into FS
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
|
2021-10-09 20:18:14 +01:00 |
|
Mnikolenko Productengine
|
a68ca665ad
|
SL-15958 Stop impostored avatars from casting shadows
|
2021-09-22 17:51:00 +03:00 |
|
Ansariel
|
5ec4c0d022
|
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-09-20 12:30:49 +02:00 |
|
Mnikolenko Productengine
|
bbd5a9c62b
|
SL-16021 FIXED impostors are creating full detailed shadows
|
2021-09-17 15:29:00 +03:00 |
|
Ptolemy
|
df5127136f
|
SL-15709: Add Tracy support to viewer
|
2021-09-03 17:53:43 -07:00 |
|
Andrey Lihatskiy
|
b18f328c08
|
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
|
2021-09-03 00:18:26 +03:00 |
|
Ansariel
|
1536fdd1c3
|
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-08-24 10:47:18 +02:00 |
|
Ansariel
|
5776bd5410
|
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-08-09 11:10:17 +02:00 |
|
Signal Linden
|
bc61c20560
|
SL-14702: Spruce up README
|
2021-08-02 10:10:14 -07:00 |
|
Ansariel
|
2253723705
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-07-21 14:13:23 +02:00 |
|
Ansariel
|
0497e3d8e9
|
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-07-21 13:36:58 +02:00 |
|
Ansariel
|
4c4dfb682a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-07-21 13:35:31 +02:00 |
|
Ansariel
|
e219b5cb41
|
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
|
2021-07-21 13:18:06 +02: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 |
|
Callum Prentice
|
8631a7a077
|
Merge with tip of Master after a Viewer release
|
2021-07-19 14:35:44 -07:00 |
|
Andrey Lihatskiy
|
3a476a8296
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-07-19 22:22:42 +03:00 |
|
Andrey Lihatskiy
|
9873e7bba9
|
Merge branch 'master' into DRTVWR-527-maint
|
2021-07-19 22:22:32 +03:00 |
|
Andrey Lihatskiy
|
2ded530f93
|
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
|
2021-07-19 22:20:45 +03:00 |
|
Ansariel
|
738e5c2659
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-07-15 19:56:26 +02:00 |