1616 Commits (68e5f326b3324d92bc6fe6ea6cc6ba559f2738b0)

Author	SHA1	Message	Date
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	95e73bf131	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/featuretable.txt # indra/newview/featuretable_mac.txt # indra/newview/llviewermedia.cpp	2023-03-31 17:03:50 +02:00
Cosmic Linden	00997b997e	SL-19399: Thanks to Ai Austin for PBR material editing improvement idea	2023-03-22 17:11:19 -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
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
Brad Linden	5fabfa50d7	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-02-02 12:11:40 -08:00
Ansariel	6cbca4da71	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llprofiler.h # indra/llcommon/lluuid.cpp # indra/llprimitive/llmodel.cpp # indra/llrender/llrendertarget.cpp # indra/newview/app_settings/settings.xml # indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl # indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl # indra/newview/llviewerwindow.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/zh/floater_about.xml	2023-02-01 11:40:17 +01:00
Andrey Kleshchev	b5b0a3fbf6	SL-19110 Fix xxhash build link and properly register contribution	2023-01-31 22:05:42 +02:00
Ansariel	68c04f41ad	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/viewer_manifest.py	2022-12-19 22:59:03 +01:00
Ansariel	5f81627faf	Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer ... # Conflicts: # doc/contributions.txt # indra/newview/llfloateravatar.h	2022-12-12 22:11:54 +01:00
Ansariel	67081f9728	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/newview/llfloater360capture.cpp	2022-12-12 22:09:54 +01: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
Ansariel	abbfb9b7d0	Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer	2022-11-22 16:23:13 +01:00
Andrey Lihatskiy	24993a914f	SL-18637 Reverted material shader changes ... original fix by Beq Janus	2022-11-14 23:58:14 +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
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
Ansariel	da8f95ad22	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-11-02 18:06:07 +01: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
Ansariel	7732257ea5	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-11-02 13:05:00 +01: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
Ansariel	9ee1a75474	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llcharacter/llkeyframemotion.cpp # indra/llcommon/lluuid.cpp # indra/llcommon/lluuid.h # indra/llui/llscrolllistctrl.cpp # indra/llui/llscrolllistctrl.h # indra/newview/app_settings/settings.xml # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatersettingsdebug.h # indra/newview/skins/default/xui/en/floater_settings_debug.xml # indra/newview/skins/default/xui/en/panel_preferences_privacy.xml	2022-11-01 17:17:56 +01:00
Ansariel	1bdfb7df70	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-11-01 15:16:40 +01: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
Ansariel	8b2b11d4a0	Merge branch 'master' of https://bitbucket.org/lindenlab/viewer	2022-10-26 20:42:44 +02:00
Ansariel	242c8cb5ed	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/CMakeLists.txt # indra/llprimitive/llmodel.cpp # indra/llwindow/CMakeLists.txt # indra/llwindow/llwindowmacosx.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lllegacyatmospherics.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvopartgroup.cpp # indra/newview/llworld.cpp	2022-10-25 11:49:36 +02:00
Andrey Lihatskiy	439aa79414	SL-18432 Fix for alpha sorting	2022-10-24 22:14:20 +03:00
Ansariel	8b0d341aca	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-10-21 12:34:53 +02: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
Ansariel	a9c29b4b81	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llui/lllineeditor.cpp # indra/llui/llmenugl.cpp # indra/llui/llmenugl.h # indra/llui/lltexteditor.cpp # indra/newview/llfloaterbump.cpp # indra/newview/llfloaterbump.h # indra/newview/llinventorypanel.cpp # indra/newview/llnetmap.cpp	2022-10-20 10:51:25 +02: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
Ansariel	2b65ae8215	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-10-15 17:33:22 +02:00
Mnikolenko Productengine	dbbc710739	SL-18348 FIXED Include next/previous face doesn't work	2022-10-13 14:39:29 +03:00
Ansariel	2aceea66ff	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/newview/llfloateropenobject.cpp # indra/newview/llfloateropenobject.h # indra/newview/llmaterialmgr.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llmeshrepository.h # indra/newview/skins/default/xui/en/floater_openobject.xml	2022-10-01 13:10:39 +02: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
Ansariel	1fc3aaff9b	Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # .gitignore # autobuild.xml # indra/CMakeLists.txt # indra/cmake/00-Common.cmake # indra/cmake/Boost.cmake # indra/cmake/BuildVersion.cmake # indra/cmake/CEFPlugin.cmake # indra/cmake/CMakeLists.txt # indra/cmake/CURL.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/DBusGlib.cmake # indra/cmake/DragDrop.cmake # indra/cmake/FMODSTUDIO.cmake # indra/cmake/FindHUNSPELL.cmake # indra/cmake/FindJsonCpp.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/FindURIPARSER.cmake # indra/cmake/FreeType.cmake # indra/cmake/GLH.cmake # indra/cmake/Hunspell.cmake # indra/cmake/JsonCpp.cmake # indra/cmake/LLKDU.cmake # indra/cmake/LLPhysicsExtensions.cmake # indra/cmake/LLPlugin.cmake # indra/cmake/LLWindow.cmake # indra/cmake/Linking.cmake # indra/cmake/MESHOPTIMIZER.cmake # indra/cmake/MediaPluginBase.cmake # indra/cmake/NGHTTP2.cmake # indra/cmake/OPENAL.cmake # indra/cmake/OpenGL.cmake # indra/cmake/OpenJPEG.cmake # indra/cmake/OpenSSL.cmake # indra/cmake/PNG.cmake # indra/cmake/Tracy.cmake # indra/cmake/UI.cmake # indra/cmake/Variables.cmake # indra/cmake/ViewerMiscLibs.cmake # indra/cmake/ZLIBNG.cmake # indra/cmake/bugsplat.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/linux_crash_logger/CMakeLists.txt # indra/llaudio/CMakeLists.txt # indra/llcommon/CMakeLists.txt # indra/llcommon/llapp.cpp # indra/llcorehttp/CMakeLists.txt # indra/llimagej2coj/CMakeLists.txt # indra/llinventory/CMakeLists.txt # indra/llmath/CMakeLists.txt # indra/llmath/llcalcparser.h # indra/llmessage/CMakeLists.txt # indra/llprimitive/CMakeLists.txt # indra/llrender/CMakeLists.txt # indra/llrender/llglslshader.cpp # indra/llwindow/CMakeLists.txt # indra/media_plugins/CMakeLists.txt # indra/media_plugins/base/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.cpp # indra/newview/llxmlrpclistener.cpp # indra/newview/llxmlrpctransaction.cpp # indra/newview/viewer_manifest.py # indra/test/CMakeLists.txt	2022-09-17 23:12:34 +02:00
Andrey Kleshchev	248bf15ce8	SL-17238 Large cmake contribution by NickyD	2022-09-17 14:03:55 +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