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

1087 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Zi Ree 88d6791ff1 Linux: Quench gcc warnings in boost includes. 2023-03-26 15:49:22 +02:00
Pork Chop 5c8d7d748b Linux: Initial work to fix broken build, restore gstreamer 1.0 2023-03-23 21:56:53 +11: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
Zi Ree 79c9873cd0 Linux: Pull in Alchemy's vertex cache optimizer fix to smooth out triangle soup in certain hair/tails - Thank you! 2023-02-16 17:46:43 +01: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 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
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
Ansariel 1ca8584322 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-22 15:48:47 +02:00
Ansariel 8b0d341aca Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 12:34:53 +02: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
Rye Mutt 1b31ab5c52 Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces 2022-09-27 17:59:21 -04: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
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
Nicky Dasmijn 0710d95f4b Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake 2022-09-16 23:15:49 +02:00
Callum Linden f08f20db5f Merge branch 'master' into DRTVWR-568 2022-09-15 17:00:34 -07:00
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel 656dd12dfc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:35:44 +02:00
Ansariel 55f51f4829 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 17:02:33 +02:00
Ansariel 41d07e237a Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-08-31 16:05:55 +02:00
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02: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 278adc482f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-12 22:51:41 +02:00
Ansariel dcfe6760e9 Wrap these - might be the reason GCC is complaining 2022-08-12 12:04:06 +02:00
Ansariel 59e8ee021e Remove duplicate assert 2022-08-10 01:21:13 +02:00
Andrey Kleshchev 09400b74ad SL-17902 Crash at LLAlignedArray, out of bounds 2022-08-04 22:14:08 +03:00
Ansariel bf24665fa6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 16:36:35 +02:00
Ansariel 49b6f9b312 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 14:52:20 +02:00
Ansariel 6d09c9ff89 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 12:37:05 +02:00
Andrey Lihatskiy 59ab8e78f4 Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelobject.cpp
 2022-08-04 00:17:55 +03:00
Ansariel 0d0d82fa97 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-08-02 12:08:32 +02:00
Ansariel 1e50da6b7a Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-07-27 02:06:54 +02:00
Cosmic Linden cdff716908 SL-17801: Don't let external code delete the raw pointer to the picking octree 2022-07-26 10:40:19 -07:00
Cosmic Linden f1128da8da SL-17801: Use raw array for mOctreeTriangles to avoid memory alignment issues, increasing risk of crashes during picking due to SIMD operations 2022-07-26 10:40:19 -07:00
Ansariel 9232846287 Build fix 2022-07-22 12:41:14 +02:00
Ansariel f9f81ebe20 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-07-22 12:19:11 +02:00
Cosmic Linden 4ef83bb8bd SL-17801: Add various safeguards to keep triangle indices count valid 2022-07-21 15:19:00 -07:00
Ansariel 33621382b4 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloateroutfitsnapshot.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
 2022-07-21 19:54:15 +02:00
Andrey Kleshchev f4e6ccc2c4 SL-17796 Crash at LLVolumeFace::getVertexData 2022-07-19 21:08:51 +03:00
Andrey Kleshchev a330095650 SL-16793 Potential crash at createSide 2022-07-07 00:01:33 +03:00
Andrey Kleshchev c01388fb0b SL-16793 Crash at LLProfile::addHole 
addHole can be accessed from main tread and from mesh thread, safeguard pt
 2022-07-06 21:24:25 +03:00
Ansariel d5501d459b Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer 2022-07-01 11:36:10 +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
Cosmic Linden 162280cd98 SL-17021: Templatize LLOctreeNode and related classes to allow for option to store elements in octrees as raw pointers. Use for faster allocation in LLVolumeFace::createOctree. 2022-06-21 12:33:32 -07:00
Cosmic Linden dbe0cb5865 SL-17021: Clean up some unneeded member variables from lloctree 
No performance difference measured
 2022-06-21 12:33:32 -07:00
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Andrey Kleshchev f451672b0c SL-17475 Fix wrong remap buffer size 2022-06-16 16:46:04 +03:00
Andrey Kleshchev b1cbf369cf SL-17475 Use a shadow indices buffer before simplification 2022-06-14 21:41:27 +03:00
Andrey Kleshchev 45bcefd981 SL-17475 fix remap causing an assert 2022-06-14 16:40:56 +03:00
Andrey Kleshchev b08340f183 SL-17475 Remap models before simplification 2022-06-11 10:23:46 +03:00
Nicky 95d5938eef Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake 2022-06-05 14:27:28 +02:00