summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2025-06-23Revert "GLM_FORCE_NEON for Windows arm64 too"Erik Kundiman
This reverts commit 75012c4f0c0b852c8bfa0b5632bf82c82f240754. I realised I was in the wrong direction after I avoided the offending lines by setting GLM_FORCE_XYZW_ONLY, and then by setting GLM_FORCE_CXX_UNKNOWN, to end up with the same 16 __m128-related "too many initializers" errors, which I believe were just obscured by the 160 syntax errors, which are to be fixed in the next commit. I had already mentioned SSE2NEON being responsible for translating __m128, but I had forgotten that it was a different package from GLM, obviously, that __m128 was never GLM_FORCE_NEON's responsibility.
2025-06-21Windows ARM64 support for StackWalkerErik Kundiman
Basically just add what the author added to the file. https://github.com/JochenKalmbach/StackWalker/commit/2a96079ba54a905d29afb3834182cbf06eff9132#diff-0d2beffe54d2ad0b9c31814fc48e5ef5841ba542fe545bba8b8971c767c89911
2025-06-21Windows arm64 can use sse2neon from vcpkgErik Kundiman
Also add cpuinfo to build preparation instruction.
2025-06-20Fix SL contributors credits on WindowsErik Kundiman
Somehow when the stream editing to delete anything that begins with 4 spaces is run from CMake (as opposed to directly on shell), it deletes most of the contributors on Windows. I've tried many methods like using \w, \s, etc., but what works is just using the first letters of the bug codenames. There are still empty results (, , ,) among the final parsed contributors, but we'll ignore them for now.
2025-06-20Re-heighten progress panel to accomodate 3p logosErik Kundiman
275 became 240 when they removed the logos, and then 240 became 220 when MotD became dynamic. So logos being back but with dynamic MotD should be 255.
2025-06-20Fix chat history (with seconds) parsed wrongErik Kundiman
https://megapahit.com/show_bug.cgi?id=163
2025-06-20Megapahit words on panel progress localisationsErik Kundiman
2025-06-19Bring 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.
2025-06-19floater_about.xml -> Space out licenses tabsecretfoxtail
Make licenses more readable, neater looking.
2025-06-19GLM_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).
2025-06-19Attempt 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.
2025-06-19Alternative 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.
2025-06-15Make 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.
2025-06-13panel_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.
2025-06-13Add Windows to the build list, sort alphabeticallyErik Kundiman
2025-06-13FMOD has been upgraded from 2.02.28 to 2.02.29Erik Kundiman
2025-06-13Remove ../lib rpath from dullahan_host for allErik Kundiman
It's irrelevant on any distro anyway.
2025-06-13Fix implicit instantiation of undefined templateErik Kundiman
'std::char_traits<unsigned short>' on FreeBSD. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282329
2025-06-13Merge tag 'Second_Life_Release#aa851928-2025.04.01' into 2025.04.1Erik Kundiman
2025-06-12Get 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
2025-06-12Put MSYSTEM_CARCH env setting check in parenthesesErik Kundiman
Parsing failed on macOS' CMake (could be MacPorts, could be the version) for some reason.
2025-06-11Merge pull request #4262 from secondlife/geenz/2025.04.1-versionbumpJonathan "Geenz" Goodman
Bump viewer version for 2025.04.1
2025-06-11Update viewer version.Jonathan "Geenz" Goodman
2025-06-11Merge pull request #4259 from secondlife/callum/awpJonathan "Geenz" Goodman
Avatar Welcome Pack (Updated to target 2025.04.1)
2025-06-12Get SSE2NEON for Windows arm64 tooErik Kundiman
2025-06-12Use 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).
2025-06-12Exclude 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.
2025-06-11Point the URL for the Avatar Welconme Pack at the production location ↵Callum Prentice
(Eventually - marshalled by [GIRD LOWER])
2025-06-11Update 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).
2025-06-10Windows 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.
2025-06-09Fix usleep implementation for WindowsErik Kundiman
https://stackoverflow.com/questions/5801813/c-usleep-is-obsolete-workarounds-for-windows-mingw
2025-06-09Fix 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
2025-06-08Re-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.
2025-06-08Fix tab to space and simplify logicsErik Kundiman
2025-06-08Windows x86-64 without SSE2 will be crashed tooErik Kundiman
2025-06-08Make 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-06tweak the size of the AWP floater to take account of new image sizes. Do not ↵Callum Prentice
center floater anymore because it obscures the avatar.
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-05Open Avatar Welcome Pack floater on first login (or cleared settings) and ↵Callum Prentice
move it to the center of the screen. Adjust the size of the floater (height) slightly.
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]
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-29 20:59:08 +0000