summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2024-08-02Merge branch 'main' into 2024.06-atlasaurusErik Kundiman
2024-08-02Fix crash when opening map on higher-end Mx CPUsErik Kundiman
There's this comment in indra/llimage/llimagejpeg.cpp: //try/catch will crash on Mac and Linux if LLImageJPEG::errorExit throws an error //so as instead, we use setjmp/longjmp to avoid this crash, which is the best we can get. --bao but setjmp longjmp that aren't properly paired should be avoided on Apple Silicon (there are multiple setjmps but only 1 longjmp) so if it still crashes, then that might be because of the try and catch but if it doesn't crash any more, then the cause might just be improperly paired setjmp and longjmp https://megapahit.com/show_bug.cgi?id=34
2024-07-31Revert "Remove double macro conditions in GL headers"Erik Kundiman
This reverts commit 591ecf748a620f7528d498e576271a33df5366ee. Unnecessarily including GLX headers in llglheaders.h would cause a conflict with some Boost 1.81 JSON header on Debian bookworm.
2024-07-29Convert leftover BOOLs to bools for FLTKErik Kundiman
2024-07-29GLM on GNU/Linux distros aren't updated enoughErik Kundiman
The viewer codebase requires GLM 1.0.x, not 0.9.x.
2024-07-29Remove LLWindowSDL::getAvailableVRAMMegabytes()Erik Kundiman
See commit ea268fcd48550f98baceef0294fd977ff12d2b35.
2024-07-29Merge branch 'main' into 2024.06-atlasaurusErik Kundiman
2024-07-29Get VLC streaming to work again on macOSErik Kundiman
Somehow it wouldn't work when the libvlc dylibs linked by media_plugin_libvlc were far in Frameworks, even with all the linkages and VLC_PLUGIN_PATH set correctly. Because of this, I had to make the libvlc files redundantly copied (they're under 1 MB so we'll live with it) in llplugin just like upstream for media_plugin_libvlc to link to instead, though it seems the directory name can be anything, so I just let it be "plugins" for installation convenience using CMake. Also now the builder is assumed to not necessarily want VLC.app to be installed in /Applications, though they would need to keep the downloaded VLC disc image open.
2024-07-28Merge branch 'main' into 2024.06-atlasaurusErik Kundiman
2024-07-28Adjust viewer name for when logging the skin usedErik Kundiman
2024-07-28Install plugins somewhere close to libvlc on macOSErik Kundiman
and without having to rename the containing folder. VLC streaming still hasn't worked (it used to) since using fixup_bundle, since switching to FMOD, since switching from SDL to Cocoa, since merging Maintenance B, so still no idea which of these is causing it.
2024-07-28Merge branch 'main' into 2024.06-atlasaurusErik Kundiman
2024-07-28Build process' set up to link to Boost staticallyErik Kundiman
on macOS and at least the one directly. Collada DOM's Boost dependency is still 1.76 in MacPorts' case, and that's why we still have Boost filesystem and system dylibs in Frameworks. On the other hand, the viewer codebase now really depends on newer Boost, in my case I can use MacPorts' 1.81. I had to switch to static because Boost 1.81 filesystem crashed for not finding the implementation of something declared using BOOST_FORCEINLINE in boost/filesystem/path.hpp. I think I know why, now. Cause the filesystem dylib that eventually got installed was the 1.76 one depended on by Collada DOM, so there was a conflict, there. For now the temporary MacPorts solution for this is to install boost181 with -no_static variant (notice the "-" there, so the static libraries are built and installed too). The rest is so hack-ish, I had to manually recreate Boost links pointing to 1.81 ones, only the ones needed, and for the libraries, only the static ones.
2024-07-28Fix libllwebrtc.dylib installation to the packageErik Kundiman
llwebrtc.h is not unnecessarily installed any more. When code signing the app on macOS, there was also a problem where it said that this header wasn't signed. ??? That's why we make sure that it won't be installed now. Also on macOS, the dylib is installed to Frameworks right away, so now we don't have any unused double in Resources.
2024-07-28Remove boost::json::serialize second argumentsErik Kundiman
to make it build with Boost older than 1.83. The argument that has been passed so far is {}, which would be implied for that parameter in newer Boost anyway.
2024-07-28Finally stop compiling lldaeloader.cpp with C++14Erik Kundiman
Quite amazing how it could get away this far having a vanilla Collada DOM up until this point, where now there would be just too many C++17 features that the lldaeloader.cpp alone would have to avoid. So we finally have to compromise now, and you'll need to replace auto_ptr in your Collada DOM installation's dae.h with unique_ptr. That's it, though.
2024-07-28Make system GLM foundErik Kundiman
I had to use find_package here directly because somehow our "different" use_system_binary wouldn't set glm_FOUND to true, even though CMake found the package.
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-07-27Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-26Remove double macro conditions in GL headersErik Kundiman
I just noticed LL_LINUX got its own scope just below LL_MESA. We're minimising difference from upstream Maintenance-B.
2024-07-25Be specific on which product is being bug reportedErik Kundiman
now that there is another product (which is Web) on Megapahit Bugzilla.
2024-07-24Merge remote-tracking branch 'origin/release/webrtc-voice' into ↵Brad Linden
release/2024.06-atlasaurus
2024-07-24Update expired cert in integration testAndrey Lihatskiy
see fe8c976 for more info
2024-07-24remove inappropriate ignoretext usage as recommended in code review.Brad Linden
2024-07-23Improve error message notifying user that Voice Morph Effects are not supportedBrad Linden
secondlife/viewer#1451
2024-07-23CMakeLists adding fsfloatersearch.hmobserveur
This commit completes the previous commit for the legacy floater
2024-07-23added some debug infos in llworldmipmapmobserveur
this is part of an effort to isolate a crash in the world map
2024-07-23Legacy search floatermobserveur
This commit adds the legacy search floater to megapahit
2024-07-23Apple gpu optimisations based on LL workmobserveur
This commit replaces our former optimisations with LL develop branch work and some tweaks.
2024-07-21Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-21Wine-based Vivox-based voice support for FreeBSDErik Kundiman
https://megapahit.com/show_bug.cgi?id=57 For SLVoice to run, there is a couple of environment variables that need to be set, and users need to run `/usr/local/share/wine/pkg32.sh install wine mesa-dri` to install the necessary files first. All this time the env parameter on apr_proc_create was never used, and this is just the place for passing those environment settings, hence the LLProcess::Param attribute addition.
2024-07-21CEF via Linux binary compatibility attempt on FBSDErik Kundiman
Since the condition is quite specific for now, debootstrapped Debian/Ubuntu x86-64 only, paths are just hardcoded. We got far enough that SLPlugin doesn't get killed, and there's no notification that "text/html" cannot be handled any more, it's just it hasn't worked yet, the built-in browser.
2024-07-20Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-20Revert "NDOF licence not included"Erik Kundiman
This reverts commit ce44f23aad76a3cd5172837de36498883c2ccbdd.
2024-07-20Merge branch 'main' into maint-bErik Kundiman
2024-07-19toolbars.xml: replace "places" with "build"secretfoxtail
Landmarks button already exists in navigation bar.
2024-07-19Copy profile link to clipboard in profile actionsErik Kundiman
https://megapahit.com/show_bug.cgi?id=47
2024-07-19CTRL-SHIFT-X to get the "Shared Enviroment"Erik Kundiman
https://megapahit.com/show_bug.cgi?id=46
2024-07-17Merge remote-tracking branch 'origin/release/webrtc-voice' into ↵Brad Linden
release/2024.06-atlasaurus # Conflicts: # autobuild.xml # indra/newview/llvoicechannel.cpp
2024-07-17Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-17Merge branch 'main' into maint-bErik Kundiman
2024-07-17Use `sed` a little bit differently on GNU/LinuxErik Kundiman
2024-07-17Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-17Merge branch 'main' into maint-bErik Kundiman
2024-07-17Apply contributors generation for non macOS tooErik Kundiman
2024-07-17Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-17Reenable OnDevicesUpdated on all platformsErik Kundiman
but not as "override" on the less supported ones.
2024-07-17Merge branch 'main' into maint-bErik Kundiman
2024-07-16Max visible distance fix in the people panelmobserveur
This commit adds a custom debug variable set to 4096 by default that affects only the people panel list.
2024-07-16Merge branch 'main' into maint-bErik Kundiman