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

1651 Commits (719a2d31dc29f3260b45c89862dd67f314331ed5)

Author SHA1 Message Date
Ansariel 719a2d31dc Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llui/llscrolllistctrl.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/textures/textures.xml
 2023-04-22 12:02:23 +02:00
Andrey Kleshchev dc5ef88e31 SL-19623 Updated contributions 2023-04-19 20:31:37 +03:00
Callum Prentice 978a5b66f2 SL-19139 Credits for Kitty - update the contributors.txt file with a mention of Kitty's large contribution. (No externally facing JIRA that I can find) 2023-04-11 11:26:37 -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 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
Callum Prentice f7838ca17c Merge branch 'main' into DRTVWR-568 2022-12-12 11:13:10 -08: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 57e8cd490f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-23 10:00:44 +01:00
Ansariel 8f45ad9323 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-22 16:29:17 +01: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 25c62f554f Merge branch 'master' into DRTVWR-570-maint-Q 2022-11-21 22:46:35 +02:00
Ansariel dbc70be7c4 Merge branch 'master' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	autobuild.xml
 2022-11-21 20:37:32 +01:00
Andrey Kleshchev 96f0c95898 Merge branch master into DRTVWR-565-maint-P 2022-11-21 20:48:24 +02:00
Kyler Eastridge 35d2771cd3 Fix spelling error on license file name 2022-11-18 06:23:11 -05:00
Kyler Eastridge 4a33a0edb2 Fix readme logo for dark theme sites 2022-11-18 06:22:43 -05: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
Callum Linden aad3b32a92 Merge branch 'master' into DRTVWR-568 2022-10-26 12:07:12 -07: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
Callum Linden 80585d56fd Merge master into DRTVWR-568 (and fix conflicts) 2022-10-24 17:48:16 -07: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 9bad5d08fb SL-17238 Large cmake contribution by NickyD 2022-09-17 19:30:31 +03: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