summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
40 hoursFix chat history (with seconds) parsed wrongErik Kundiman
https://megapahit.com/show_bug.cgi?id=163
2 daysMegapahit words on panel progress localisationsErik Kundiman
3 daysBring back 3p logos to the viewer, mainly for FMODErik Kundiman
I checked out the related files from 45249de1ca418324c4077312eefc7edc7e22c401, before the merge with upstream logo removal, but then I had to reapply c2d491905b668702d5640c7c5472629f7acc27e0, the MotD dynamic resizing, and remove the unused commented out vivox-related part since we're not redistributing it.
3 daysfloater_about.xml -> Space out licenses tabsecretfoxtail
Make licenses more readable, neater looking.
3 daysGLM_FORCE_NEON for Windows arm64 tooErik Kundiman
though there are still so many compile errors, but it should be in the right direction, cause firstly we can't let it use GLM_FORCE_SSE2 otherwise it would include x/emmintrin headers, and secondly, if none of the GLM_FORCEs is used then the errors are much fewer but related to __m128 which should be translatable by SSE2NEON (that's why I believe GLM_FORCE_NEON should be ON for Windows arm64 too).
3 daysAttempt to replace __cpuid, on arm64 using cpuinfoErik Kundiman
This commit is for getting rid of the compile error for now, we don't know yet if this will work correctly or not.
3 daysAlternative to rdtsc, for Windows arm64Erik Kundiman
Just copying from this: https://forum.juce.com/t/windows-arm64-support/47572/6 This commit is for getting rid of the compile error for now, we don't know yet if this will work correctly or not.
7 daysMake sure lib/release exists on Windows arm64Erik Kundiman
before using it for ColladaDOM library file, cause it seems that ColladaDOM is the first one that gets built on Windows arm64 before any other package gets installed and implicitly creating that folder.
9 dayspanel_group_info_sidetray.xml adjustmentsecretfoxtail
move button_row_ls up a little bit so that the buttons are not cut off by the bottom edge of the floater.
9 daysAdd Windows to the build list, sort alphabeticallyErik Kundiman
9 daysFMOD has been upgraded from 2.02.28 to 2.02.29Erik Kundiman
9 daysRemove ../lib rpath from dullahan_host for allErik Kundiman
It's irrelevant on any distro anyway.
9 daysFix implicit instantiation of undefined templateErik Kundiman
'std::char_traits<unsigned short>' on FreeBSD. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282329
10 daysGet rid of C5104 warnings on arm64Erik Kundiman
I felt like they slowed down the flow. https://developercommunity.visualstudio.com/t/warnings-in-a-windows-sdk-header-when-compiling-wi/897227
10 daysPut MSYSTEM_CARCH env setting check in parenthesesErik Kundiman
Parsing failed on macOS' CMake (could be MacPorts, could be the version) for some reason.
10 daysGet SSE2NEON for Windows arm64 tooErik Kundiman
10 daysUse system (vcpkg) OpenSSL & cURL on Windows arm64Erik Kundiman
cURL is installed on arm64 cause there doesn't seem to be any easy way to build OpenSSL 1.1 for Windows arm64 (which LL's cURL fork depends on).
10 daysExclude Windows arm64 from WebRTCErik Kundiman
Crow Misia's libwebrtc-bin, the one we've been relying on for WebRTC binaries, doesn't seem to be providing Windows arm64 binaries yet.
11 daysUpdate Windows build instructionsErik Kundiman
There's a different section for Windows arm64, cause there are different patterns in the commands that are too difficult to generalise. BuildTools is used instead of the full Visual Studio IDE, and BuildTools is installed in Program Files (x86) on both Windows x64 and arm64. The CMake used is the one automatically installed by vcpkg, and it can find the compilers when the toolchain file setting is set to the file provided by vcpkg. This way we don't have to install VS CMake component that depends on x64/x86 build tools, which we don't need for Windows arm64. The pkg-config used is the other one downloaded, as the path to it is common on both Windows arm64 and x64. cURL is installed on arm64 cause there doesn't seem to be any easy way to build OpenSSL 1.1 for Windows arm64 (which LL's cURL fork depends on).
12 daysWindows menu shortcut & InstallDir without versionErik Kundiman
Referring to cpack-generators(7) manual, I don't know what to replace the <compName> in CPACK_NSIS_<compName>_INSTALL_DIRECTORY with, but in CPACK_NSIS_INSTALL_ROOT explanation, it mentions the full directory presented to the end user, and from that we can conclude the variable we need to set for customisation is just CPACK_PACKAGE_INSTALL_DIRECTORY.
13 daysFix usleep implementation for WindowsErik Kundiman
https://stackoverflow.com/questions/5801813/c-usleep-is-obsolete-workarounds-for-windows-mingw
13 daysFix all media plugins failure on WindowsErik Kundiman
Uncomment a couple of commented out lines out in indra/llplugin/slplugin.cpp and adjust to something like: LLError::setTagLevel("Plugin", LLError::LEVEL_DEBUG); LLError::logToFile("C:\\Users\\erik\\AppData\\Roaming\\Megapahit\\logs\\slplugin.log"); I got "The requested service provider could not be loaded or initialized" This really helped me solve it: https://travis-ci.community/t/socket-the-requested-service-provider-could-not-be-loaded-or-initialized/1127
14 daysRe-enable gSavedSettings & CEF logging on WindowsErik Kundiman
I started with disabling it for having BUILD_SHARED_LIBS on. Then I enabled it for macOS when I added internal browser support for macOS. Then I enabled it for Linux when I added internal browser support for Linux. Then I enabled it for FreeBSD when I added internal browser support attempt for FreeBSD. I should have left it enabled by default except for platforms that surely are not supported to have internal browser.
14 daysFix tab to space and simplify logicsErik Kundiman
14 daysWindows x86-64 without SSE2 will be crashed tooErik Kundiman
14 daysMake sure Windows include CEF & Dullahan headersErik Kundiman
and minimise diff related to LibVLC headers.
2025-06-07FS search cleanup -> Categories dropdown buttonsecretfoxtail
Move categories dropdown button so that it is not cut off by the edge of the floater, also fix "Arts and Culture" & "Parks and Nature" places categories displaying "MissingString"
2025-06-07Fix ColladaDOM link error to Boost throw_exceptionErik Kundiman
in viewer linking stage on Windows. throw_exception is user defined (it's not picking up its definition from anywhere on Windows, at least when using vcpkg's Boost). (Link target) -> libcollada14dom23-s.lib(daeURI.obj) : error LNK2019: unresolved external symbol void __cdecl boost::throw_exception(class std::exception const &) (?throw_exception@boost@@YAXAEBVexception@std@@@Z) referenced in function void __cdecl boost::re_detail_500::raise_runtime_error<class boost::regex_error>(class boost::regex_error const &) (??$raise_runtime_error@Vregex_error@boost@@@re_detail_500@boost@@YAXAEBVregex_error@1@@Z) [C:\Users\erik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj]
2025-06-07Adjust info for Windows viewer app propertiesErik Kundiman
2025-06-07Overwrite SL test icons with MP's with same namesErik Kundiman
Less diffs. And only a couple.
2025-06-07Install DLLs needed by media plugins to llpluginErik Kundiman
2025-06-06Enable media plugins on WindowsErik Kundiman
Put the necessary files into place. But, none of them is working just yet.
2025-06-06Revert "Exclude Windows from referring to LibVLC headers"Erik Kundiman
This reverts commit f0de1898e0b6a3b9f1ee1bcc762ba334b78bbcc6.
2025-06-06Make the viewer installable & runnable on WindowsErik Kundiman
Turns out the CMAKE_BUILD_TYPE setting is necessary, otherwise it would be built in RelWithDebInfo configuration. Reorganise the contributors generation and general CPack settings in indra/newview/CMakeLists.txt. Running sed when cross-comping for Linux, on FreeBSD, doesn't need to use Linux's sed, so no need for ${CMAKE_SYSROOT}/usr/bin prefix, this way that section can be reused for Windows. I still couldn't get CPack to make NSIS not use the version numbers as part of the default installation destination. Using TARGETS for installing llwebrtc would cause the .lib to be installed too, which isn't necessary, that's why we use PROGRAMS. contributors.txt still gets generated wrongly. The executable icon is still SL's test icon. ColladaDOM's failure to link to Boost throw_exception, from its use of Boost Regex, is not fixed yet. I got to this stage by temporarily removing the offending lines in daeURI.cpp (which are the lines where Boost Regex is used).
2025-06-06Fix another wstring Boost filesystem linking errorErik Kundiman
I couldn't get the LL_WARNS to link on Windows yet, so they're just disabled for now, they're only warnings to the users anyway. The error was: llfilesystem.lib(lldiskcache.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(unsigned short const *,unsigned short const *,class std::basic_string<char,struct std::char_traits<char>,cla ss std::allocator<char> > &,class std::codecvt<unsigned short,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBG0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@GDU_Mbstatet@@@6@@Z) referenced in function "public: void __cdecl LLDiskCache::clearCache(void)" (?clearCache@LLDiskCache@@QEAAXXZ) [C:\Users\erik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj]
2025-06-06Fix another wstring Boost filesystem linking errorErik Kundiman
Basically string() functions call this convert(). The error was: llfilesystem.lib(lldiriterator.obj) : error LNK2001: unresolved external symbol "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(unsigned short const *,unsigned short const *,class std::basic_string<char,struct std::char_traits<char>,c lass std::allocator<char> > &,class std::codecvt<unsigned short,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBG0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@GDU_Mbstatet@@@6@@Z) [C:\Users\er ik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj] Hint on symbols that are defined and could potentially match: "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(char const *,char const *,class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > &,class std::codecvt<wchar_t,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBD0AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@PEBV?$codecvt@_WDU_Mbstatet@@@6@@Z) "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(wchar_t const *,wchar_t const *,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > &,class std::codecvt<wchar_t,char,struct _Mbstatet> const *) " (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEB_W0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@_WDU_Mbstatet@@@6@@Z)
2025-06-05Rearrange the MP bringer namesErik Kundiman
cause I see the order as per row, going right first, then down left, then right again, then down left again, and so on.
2025-06-05Fix 2 wstring linking errors to Boost filesystemErik Kundiman
The errors were: llfilesystem.lib(lldiskcache.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(char const *,char const *,class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,cla ss std::allocator<unsigned short> > &,class std::codecvt<unsigned short,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBD0AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@PEBV?$codecvt@GDU_Mbstatet@@@6@@Z) refe renced in function "public: void __cdecl LLDiskCache::purge(void)" (?purge@LLDiskCache@@QEAAXXZ) [C:\Users\erik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj] Hint on symbols that are defined and could potentially match: "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(char const *,char const *,class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > &,class std::codecvt<wchar_t,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBD0AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@PEBV?$codecvt@_WDU_Mbstatet@@@6@@Z) "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(wchar_t const *,wchar_t const *,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > &,class std::codecvt<wchar_t,char,struct _Mbstatet> const *) " (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEB_W0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@_WDU_Mbstatet@@@6@@Z) llfilesystem.lib(lldir.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) void __cdecl boost::filesystem::detail::path_traits::convert(unsigned short const *,unsigned short const *,class std::basic_string<char,struct std::char_traits<char>,class std ::allocator<char> > &,class std::codecvt<unsigned short,char,struct _Mbstatet> const *)" (__imp_?convert@path_traits@detail@filesystem@boost@@YAXPEBG0AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBV?$codecvt@GDU_Mbstatet@@@6@@Z) referenced in functi on "public: class std::vector<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >,class std::allocator<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > > __cdecl LLDir::getFilesInDir(class std: :basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)" (?getFilesInDir@LLDir@@QEAA?AV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@st d@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@@Z) [C:\Users\erik\Documents\Megapahit\viewer\build-mingw64_nt-10.0-19045-x86_64\newview\megapahit.vcxproj]
2025-06-05floater_about.xml -> credits cleanupsecretfoxtail
Correct indendation in list of names and simplify special thanks text
2025-06-05Combine 2 ColladaDOM sed process in 1 executionErik Kundiman
and make the if, else, & endif styles more consistent.
2025-06-05Only Windows link to Boost JSON library fileErik Kundiman
Adding another library file to link means adding many more lines for other platform(s), at least for macOS with its bundling. It's much simpler to make the condition on 2 files.
2025-06-04floater_about.xml -> List credits in 2 columnssecretfoxtail
Use monospace font to manually format credits list in 2 columns, also fix annoying indent in licences tab
2025-06-04Re-enable GL extension loading function pointersErik Kundiman
on Windows, which might have been because I was still using MinGW back then.
2025-06-04No link to vcpkg absent Boost Regex library fileErik Kundiman
2025-06-04Fix vcpkg Boost JSON linking errorsErik Kundiman
The error was "definition of dllimport static data member not allowed", and not "definition of dllimport function not allowed" as mentioned in commit 2bf9d234aac30ed4a85282730da0ffc83acf9adf description. Basically there were about 5 offending files, and all had BOOST_JSON_REQUIRE_CONST_INIT in them. Not including json/src.hpp (that includes them among others), fixes those errors, but then there are definitions in them that are actually used by llsdjson. After doing so many searches, I came across this: https://stackoverflow.com/questions/3491990/c-definition-of-dllimport-static-data-member and just from the first paragraph in the accepted answer, I realised llsdjson can still have those definitions, just not from the offending headers, but by simply linking to Boost JSON compiled library instead.
2025-06-04Set ColladaDOM to refer to vcpkg BoostErik Kundiman
Turns out I couldn't repeat self-building ColladaDOM using SLv prebuilt Boost successfully, because of the zlib, minizip, libxml2 header directories search confusion, no matter how I tried tinkering with LL's ColladaDOM fork CXX_FLAGS and/or EXTRA_COMPILE_FLAGS settings. With vcpkg Boost, self-building ColladaDOM in the viewer CMake configuration stage goes smoothly (compiling ColladaDOM on Windows could take a while, though.. at least on my system).
2025-06-04Revert "Use LL's prebuilt Windows Boost for now"Erik Kundiman
This reverts commit 2bf9d234aac30ed4a85282730da0ffc83acf9adf.
2025-06-04Self-build ColladaDOM on WindowsErik Kundiman
Plus simplifying the SHARED to STATIC stream editing by not using the global 'g' key, cause it's only 1 instance to edit. For now, BOOST_CFLAGS & BOOST_LIBS are set to refer to SLv prebuilt binary installation, along with its library suffix. try_compile doesn't seem to "compile" it, but it does configure it, so we just execute MSBuild.exe afterwards. Last time I tried, it didn't finish building or didn't build successfully, though. So what I did is manually run MSBuild.exe on ColladaDOM's solution file, and the next CMake configuration picked up the generated library, renamed to be the same as expected when using SLv prebuilt one, so that we don't have to adjust more lines for this, it has to be copied/moved anyway, might as well rename it the same. About the WIN32 definition stream editing, somehow WIN32 is not defined in daeUtils.cpp, that it would fail at deciding which commands to compile. I did try adding /DWIN32 to CXX_FLAGS but it ruined it for the Minizip header directory search. So the hack is to just forcefully define WIN32 in that file.
2025-06-04Exclude Windows from compiling llappviewerlinuxErik Kundiman
That's why it was trying to find llwindowsdl.h, through llappviewerlinux.cpp. I had to scroll up a bit to find out that it was trying to compile llappviewerlinux.cpp. The last error message only complained about missing SDL/SDL.h (referred from llwindowsdl.h).
2025-06-03Exclude Windows from referring to LibVLC headersErik Kundiman
for now, until we are ready to enable media plugins on Windows.
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 04:03:33 +0000