Ansariel
|
ffa21ae649
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_linux.txt
# indra/newview/fsfloaterperformance.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2023-04-28 00:39:47 +02:00 |
|
Ansariel
|
68e5f326b3
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# .gitignore
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/GLEXT.cmake
# indra/cmake/LLCommon.cmake
# indra/cmake/LLMath.cmake
# indra/cmake/LLRender.cmake
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/llrender/llglheaders.h
# indra/llrender/llglslshader.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llface.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llxmlrpctransaction.cpp
|
2023-03-31 18:54:16 +02:00 |
|
Ansariel
|
40b731eb76
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
# Conflicts:
# .gitignore
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
|
2023-03-21 10:57:56 +01:00 |
|
Ansariel
|
f2236ddf34
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-03-07 14:22:57 +01:00 |
|
Ansariel
|
645cca9765
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-02-10 10:52:46 +01:00 |
|
Ansariel
|
7cedcf36e2
|
Fix OSX build
|
2023-02-03 21:49:01 +01:00 |
|
Ansariel
|
06ac6c615c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# .gitignore
# doc/contributions.txt
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llviewercontrol.cpp
# indra/newview/viewer_manifest.py
|
2023-02-03 15:34:47 +01:00 |
|
Ansariel
|
73e5615d43
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
# indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
# indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
# indra/newview/llsettingsvo.cpp
|
2023-02-03 11:11:13 +01:00 |
|
Ansariel
|
ddfd54650e
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
|
2022-11-23 10:02:57 +01:00 |
|
Ansariel
|
cb10f3b149
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
|
2022-11-11 12:15:54 +01:00 |
|
Beq
|
dedee8ba50
|
initial merge form DRTVWR-539 branch
|
2022-11-02 22:37:24 +00:00 |
|
Rye Mutt
|
971fd6f843
|
Fix use of deprecated CGDisplayAvailableModes with CGDisplayCopyAllDisplayModes
|
2022-10-29 23:18:35 -04:00 |
|
Rye Mutt
|
d89033420e
|
Fix RenderAppleUseMultGL debug setting for enabling threaded GL engine
|
2022-10-29 23:18:03 -04:00 |
|
Rye Mutt
|
97ea17e6e9
|
Fix leak of copy and paste on mac
|
2022-10-28 18:50:38 -04:00 |
|
Ansariel
|
a1090f5f5d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/quickprefs.cpp
|
2022-10-24 19:54:30 +02:00 |
|
Ansariel
|
66bde72599
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-10-21 13:51:00 +02: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 |
|
Maxim Nikolenko
|
0bbe44c4b9
|
SL-17541 simple fallback when refresh rate is unknown
|
2022-10-03 15:52:50 +03:00 |
|
Mnikolenko Productengine
|
85504f085e
|
Merge branch 'master' into DRTVWR-539
|
2022-09-21 18:36:49 +03:00 |
|
Ansariel
|
0e325eab28
|
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/Python.cmake
# indra/llcommon/llsd.h
# indra/llcommon/llstl.h
# indra/llinventory/llparcel.cpp
# indra/llmessage/llmessagethrottle.cpp
# indra/llui/lldockablefloater.h
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llwatchdog.cpp
# indra/newview/viewer_manifest.py
|
2022-09-17 14:37:33 +02:00 |
|
Callum Linden
|
f08f20db5f
|
Merge branch 'master' into DRTVWR-568
|
2022-09-15 17:00:34 -07:00 |
|
Andrey Lihatskiy
|
329268c5f7
|
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llmodelpreview.h
|
2022-09-15 20:44:04 +03:00 |
|
Nat Goodspeed
|
65612700f3
|
DRTVWR-558: Eliminate many spurious set-not-used variables.
With Xcode 13.4, these unused variables break Release builds.
|
2022-08-24 14:00:16 -04:00 |
|
Ansariel
|
e8f4153fc2
|
Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
|
2022-06-30 18:59:34 +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
|
076a895062
|
SL-17635 remove unused variables
|
2022-06-21 17:55:29 +03:00 |
|
Ansariel
|
8ac67e5476
|
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
|
2022-06-18 15:53:35 +02:00 |
|
Howard Stearns
|
758a602f20
|
SL-17485 - mac getVramSize should return all vram, not just texture-specific, and use to compute getAvailableVRAMMegabytes.
|
2022-06-13 13:52:06 -07:00 |
|
Mnikolenko ProductEngine
|
76c8a7ff0b
|
SL-17541 show the message on mac
|
2022-06-08 03:15:59 +03:00 |
|
Andrey Lihatskiy
|
9b0569840f
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
|
2022-05-31 01:58:09 +03:00 |
|
Ansariel
|
bebd6c5e13
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/llappviewer.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:32 +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 |
|
Mnikolenko Productengine
|
0aaf5284dc
|
Merge branch 'master' into DRTVWR-539
# 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-02 00:46:10 +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
|
1e0eafd50c
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
|
2022-02-28 21:56:25 +02:00 |
|
Ansariel
|
f0352ff093
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-02-16 09:49:24 +01:00 |
|
Ansariel
|
8f85cbf04c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-02-16 09:00:13 +01:00 |
|
Mnikolenko ProductEngine
|
df0cf8cd44
|
SL-16757 FIXED [Mac] third-person cursor doesn't return after switching away from app and back
|
2022-02-14 00:25:13 +01:00 |
|
Mnikolenko ProductEngine
|
1e36ef2113
|
SL-16757 FIXED [Mac] third-person cursor doesn't return after switching away from app and back
|
2022-02-08 15:37:56 +02:00 |
|
Ansariel
|
d881fa40d3
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
|
2021-11-20 22:35:31 +01:00 |
|
Mnikolenko ProductEngine
|
fdeeb0190e
|
SL-16330 Allow vsync update without restart on mac
|
2021-11-17 17:51:50 +02: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
|
ef7f27b0d5
|
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-11-16 16:30:20 +01:00 |
|
Ansariel
|
969762f162
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 16:29:50 +01:00 |
|
Andrey Lihatskiy
|
30c381406c
|
Merge branch 'master' into DRTVWR-530-maint
# Conflicts:
# doc/contributions.txt
|
2021-11-16 01:09:11 +02: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 |
|
Mnikolenko Productengine
|
768b7a4d33
|
SL-16330 Clean up vertical sync handling, add to UI
|
2021-11-09 17:17:49 +02:00 |
|
Andrey Kleshchev
|
e791737032
|
SL-14664 Fix missed pixmap init
|
2021-10-29 12:14:12 +03:00 |