livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,989 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

306 Commits (a831237e29c650146b6870b568feddcda310ab29)

Author SHA1 Message Date
Ansariel a831237e29 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llimage/llimage.h
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	scripts/messages/message_template.msg.sha1
 2024-02-06 17:58:20 +01:00
Lars Næsbye Christensen da967da9c7 Rename OS X to macOS, mostly in comments 
We only support 10.13+ now, and it's been called macOS since 10.12. References in code to older versions are unchanged.
 2024-01-11 19:11:33 +02:00
Ansariel aa7c8eeaef Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llprofiler.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
 2023-11-07 11:56:19 +01:00
Dave Parks 70721bae39 DRTVWR-559 Fix for mac build. 2023-11-03 11:15:19 -05:00
Dave Parks 65fb4e67cb SL-19979 Fix for frame stalls on mac with shadows enabled. Also fix multihreaded GL not working on mac (thanks, Rye!) 2023-11-02 10:47:15 -05:00
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
Brad Linden 369945b45d Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539 2023-04-26 15:38:47 -07: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
Brad Linden a548c16989 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-03-29 14:54:06 -07: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
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
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
Mnikolenko Productengine e7ba1753d2 Merge branch 'main' into DRTVWR-539 
# Conflicts:
#	doc/contributions.txt
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt
 2023-02-03 01:46:01 +02:00
Brad Linden 5fabfa50d7 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-02-02 12:11:40 -08:00
Ansariel ddfd54650e Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2022-11-23 10:02:57 +01:00
Mnikolenko Productengine de0317cc3f Merge branch 'DRTVWR-568' into DRTVWR-539 2022-11-22 23:12:05 +02: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
Callum Linden 80585d56fd Merge master into DRTVWR-568 (and fix conflicts) 2022-10-24 17:48:16 -07: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
Andrey Kleshchev 24fb2f8336 Merge branch 'master' (DRTVWR-548) into DRTVWR-559 
# 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/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
 2022-10-21 18:19:27 +03: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
Andrey Kleshchev 7649114588 Merge branch master (DRTVWR-571) into DRTVWR-559 
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
 2022-09-16 21:07:39 +03: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