summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2025-05-31Merge branch 'main' into 2025.05Erik Kundiman
2025-05-31Squeeze 1 more person into the teamErik Kundiman
2025-05-31Merge tag 'Second_Life_Release#2d0f9e47-2025.05' into 2025.05Erik Kundiman
2025-05-31#4191 Crash opening a gltf modelAndrey Kleshchev
2025-05-30Merge remote-tracking branch 'secondlife/project/gltf-mesh-import' into ↵Erik Kundiman
gltf-mesh-import
2025-05-30#4191 skip loading model compressed with DracoMaxim Nikolenko
2025-05-29#4190 provide unsupported extension info in logMaxim Nikolenko
2025-05-29Enable the all MOAP option, forgot that was blocked out.Darl
2025-05-29#3367 Fix post-merge regressionAndrey Lihatskiy
2025-05-29Remove duplicated code (#4187)Ansariel Hiller
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-29first_login_image placeholdersecretfoxtail
Use original, if somewhat generic landscape screenshot inplace of edited stock screenshot.
2025-05-29RenderMinFreeMainMemoryThreshold decrease & persistencesecretfoxtail
Decrease to 256 to reduce aggressive culling & make user changes to this value persistent across restarts.
2025-05-29MP_Logo.png adjustmentsecretfoxtail
Better match style of default SL_Logo.png
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-29Merge tag 'Second_Life_Project#b9ab6c36-2025.05' into 2025.05Erik Kundiman
2025-05-29Merge branch '2025.04'Erik Kundiman
2025-05-29Fix GL init on Linux/SDL on various combinations of GPU driverRye Cogtail
2025-05-29Clean up more dead X11 code from SDL impl and modernize mouse capture with ↵Rye Cogtail
SDL_CaptureMouse
2025-05-28Merge pull request #4182 from secondlife/mainAndrey Lihatskiy
GLTF Mesh Import: Post-release merge
2025-05-28Merge branch 'main' into marchcat/2505-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h
2025-05-28#4080 Fix gltf crash when openingAndrey Kleshchev
2025-05-28#4080 Rigged mesh support #6Andrey Kleshchev
For now not touching normalizeVolumeFaces() to not brick dae upload
2025-05-28Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-developJonathan "Geenz" Goodman
2025-05-28Implement support for PRIM_MEDIA_FIRST_CLICK_INTERACT and autoplay for HUD mediaDarl
2025-05-28Clean up old linux workaroundsRye Cogtail
2025-05-28Clean up SDL window creation and fix various bugsRye Cogtail
Add support for Core and Debug GL context creation Fix window position support Fix vsync handling Add minimum GL context support
2025-05-28Fix shutdown crash from failing to clean up SDL window properlyRye Cogtail
2025-05-28Clean up SDL window event handling and implement missing functionalityRye Cogtail
Horizontal Scrollwheels Proper extra mouse button handling SDL native double click handling
2025-05-28Implement various missing functions and callbacks in SDL window backendRye Cogtail
2025-05-28Update SDL clipboard, icon flash, and url opening handlers to use native SDL ↵Rye Cogtail
functions
2025-05-28Fix name of vsync param in LLWindowSDL (#2502)Ansariel Hiller
2025-05-28Fix trailing whitespaceAndrey Lihatskiy
2025-05-28Post merge cleanup of Linux codeNicky
2025-05-28#4080 Rigged mesh support #5Andrey Kleshchev
2025-05-27#4157 Improve "Unable to upload material" error messageAndrey Lihatskiy
2025-05-27#4107 upload the model ignoring unsupported extensionMaxim Nikolenko
2025-05-27Fix mistake, don't self-build ColladaDOM on Windows for nowErik Kundiman
2025-05-27Icons adjustmentsecretfoxtail
Restore default SL_logo.png and hand.png, change MP_Logo.png to downscale of app icon.
2025-05-27res-sdl cursor tweakssecretfoxtail
misc adjustments to some of the red-sdl cursors
2025-05-27Exempt logging that prints build-time path on FBSDErik Kundiman
2025-05-27Pass configuration phase with vcpkg replacing MSYS2Erik Kundiman
I happen to be using just Git Bash for convenience for running the commands on the Windows build instructions, hence the build folder pattern to be ignored from the result of running `uname -s` there. The instructions omit the part where you install vcpkg and set the VCPKG_ROOT environment variable, cause it depends on where you install vcpkg to your liking, but the next commands will rely on that variable being set correctly. The CMake used here is MS VS 2022 Community Edition's one, since it will know where the C++ compiler is. $VCPKG_ROOT/downloads/tools/msys2/21caed2f81ec917b/mingw64/bin is where pkg-config.exe can be found. $VCPKG_ROOT/installed/`uname -m|sed 's/86_//'`-windows/tools/libxml2 is where xmllint.exe can be found (from libxml2[tools]). PKG_CONFIG_LIBDIR and PYTHON environment settings are pretty self-explanatory. The flags set on LL_BUILD are now for Visual C++ and not MinGW(64)'s GCC or Clang any more, and copied from most of the flags in the variables file from LL's build-variables repo. vcpkg's apr & apr-util packages don't seem to install their .pc files, hence the manual target_include/link_directories/libraries settings, relying on some automatically generated INTERNAL CMake variable called prefix_result. vcpkg's Boost needs the same treatment, plus some suffix. We still use LL's prebuilt libs for OpenSSL, libcurl and WebRTC. Actually too for ColladaDOM for now, but we prepare Windows ColladaDOM self-building for later. For GLM and Meshoptimizer too, it's just the checking that's skipped otherwise it would fail (but the vcpkg packages can be used). Visual C++ doesn't recognise the no-deprecated-declarations compile option. On Visual C++, the macro to denote x86-64 seems to be _M_X64 (if not added there, it would try to find sse2neon :)) We still aren't using Autobuild here for Windows either, hence the FALSE-d viewer_manifest.py based file bundling.
2025-05-27Add font buffer resetting in LLLineEditor.clear() (#4159)TJ
2025-05-27Add missing FBSD building steps & fix its depsErik Kundiman
Even though the windlight file names containing %20 & %21 isn't liked by either CPack or FBSD packaging problem will eventually have to be solved, the hack steps are small that they should just be documented, in case (more) others would like to build the FBSD package. Use custom PYTHON environment setting instead of relying on creating links named python and/or python 3 to the system Python executable. Reorder build requirements, add missing dependencies that can be set to automatically installed. The absences of some were leftovers from dependency on system ColladaDOM and GTK2 (or my failure to add some package names to the CPack dependencies, caused by the gtk2 vs. gtk20, apr vs. apr1, sdl2 vs. sdl20, etc. FBSD package/port naming confusion).
2025-05-27#4109 Improve LLGLTFLoader::computeCombinedNodeTransform()Andrey Lihatskiy
2025-05-26#4080 Rigged mesh support #4Andrey Kleshchev
2025-05-26#4109 Add validation for non-triangulated geometry in GLTF loaderAndrey Lihatskiy
2025-05-26#4080 Rigged mesh support #3Andrey Kleshchev
2025-05-26Make appdelegate-objc compilable again on MontereyErik Kundiman
where the Xcode version is 14.2 and the SDK version is MacOSX13.1, by specifically excluding llappdelegate-objc.mm from being compiled using the C++20 standard. In this case, the standard is reverted to C++17 but specifically only for that file. The errors didn't happen on newer SDK versions such as the one in Sonoma or Sequoia, and the errors looked completely unrelatable: /Users/erik/Documents/Megapahit/viewer/indra/llwindow/llopenglview-objc.h:36:41: warning: cannot find protocol definition for 'NSTextInputClient' @interface LLOpenGLView : NSOpenGLView <NSTextInputClient> ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSTextInputClient.h:20:11: note: protocol 'NSTextInputClient' has no definition @protocol NSTextInputClient ^ In file included from /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:27: /Users/erik/Documents/Megapahit/viewer/indra/llwindow/llappdelegate-objc.h:30:38: warning: cannot find protocol definition for 'NSApplicationDelegate' @interface LLAppDelegate : NSObject <NSApplicationDelegate> { ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSApplication.h:318:11: note: protocol 'NSApplicationDelegate' has no definition @protocol NSApplicationDelegate <NSObject> ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:49:27: warning: instance method '-release' not found (return type defaults to 'id') [-Wobjc-method-access] [currentInputLanguage release]; ^~~~~~~ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSString.h:99:12: note: receiver is instance of class declared here @interface NSString : NSObject <NSCopying, NSMutableCopying, NSSecureCoding> ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:107:33: warning: instance method '-UTF8String' not found (return type defaults to 'id') [-Wobjc-method-access] const char* url_utf8 = [url UTF8String]; ^~~~~~~~~~ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSString.h:99:12: note: receiver is instance of class declared here @interface NSString : NSObject <NSCopying, NSMutableCopying, NSSecureCoding> ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:107:17: error: cannot initialize a variable of type 'const char *' with an rvalue of type 'id' const char* url_utf8 = [url UTF8String]; ^ ~~~~~~~~~~~~~~~~ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:140:38: warning: instance method '-stopModal' not found (return type defaults to 'id') [-Wobjc-method-access] [[NSApplication sharedApplication] stopModal]; ^~~~~~~~~ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSApplication.h:158:12: note: receiver is instance of class declared here @interface NSApplication : NSResponder <NSUserInterfaceValidations, NSMenuItemValidation, NSAccessibilityElement, NSAccessibility> ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:144:15: warning: instance method '-release' not found (return type defaults to 'id') [-Wobjc-method-access] [frameTimer release]; ^~~~~~~ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSTimer.h:10:12: note: receiver is instance of class declared here @interface NSTimer : NSObject ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:157:15: warning: instance method '-release' not found (return type defaults to 'id') [-Wobjc-method-access] [frameTimer release]; ^~~~~~~ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSTimer.h:10:12: note: receiver is instance of class declared here @interface NSTimer : NSObject ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:158:38: warning: instance method '-terminate:' not found (return type defaults to 'id') [-Wobjc-method-access] [[NSApplication sharedApplication] terminate:self]; ^~~~~~~~~ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSApplication.h:158:12: note: receiver is instance of class declared here @interface NSApplication : NSResponder <NSUserInterfaceValidations, NSMenuItemValidation, NSAccessibilityElement, NSAccessibility> ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:206:35: error: declaration of 'arrayWithObjects:count:' is missing in NSArray class NSArray* nonRomanScript = @[@"ja", @"ko", @"zh-Hant", @"zh-Hans"]; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:207:29: warning: instance method '-containsObject:' not found (return type defaults to 'id') [-Wobjc-method-access] if ([nonRomanScript containsObject:currentInputLanguage]) ^~~~~~~~~~~~~~ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSArray.h:17:12: note: receiver is instance of class declared here @interface NSArray<__covariant ObjectType> : NSObject <NSCopying, NSMutableCopying, NSSecureCoding, NSFastEnumeration> ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'isEqual:' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:17:1: note: method 'isEqual:' declared here - (BOOL)isEqual:(id)object; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'class' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:21:1: note: method 'class' declared here - (Class)class OBJC_SWIFT_UNAVAILABLE("use 'type(of: anObject)' instead"); ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'self' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:22:1: note: method 'self' declared here - (instancetype)self; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'performSelector:' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:24:1: note: method 'performSelector:' declared here - (id)performSelector:(SEL)aSelector; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'performSelector:withObject:' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:25:1: note: method 'performSelector:withObject:' declared here - (id)performSelector:(SEL)aSelector withObject:(id)object; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'performSelector:withObject:withObject:' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:26:1: note: method 'performSelector:withObject:withObject:' declared here - (id)performSelector:(SEL)aSelector withObject:(id)object1 withObject:(id)object2; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'isProxy' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:28:1: note: method 'isProxy' declared here - (BOOL)isProxy; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'isKindOfClass:' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:30:1: note: method 'isKindOfClass:' declared here - (BOOL)isKindOfClass:(Class)aClass; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'isMemberOfClass:' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:31:1: note: method 'isMemberOfClass:' declared here - (BOOL)isMemberOfClass:(Class)aClass; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'conformsToProtocol:' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:32:1: note: method 'conformsToProtocol:' declared here - (BOOL)conformsToProtocol:(Protocol *)aProtocol; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'respondsToSelector:' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:34:1: note: method 'respondsToSelector:' declared here - (BOOL)respondsToSelector:(SEL)aSelector; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'retain' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:36:1: note: method 'retain' declared here - (instancetype)retain OBJC_ARC_UNAVAILABLE; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'release' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:37:1: note: method 'release' declared here - (oneway void)release OBJC_ARC_UNAVAILABLE; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'autorelease' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:38:1: note: method 'autorelease' declared here - (instancetype)autorelease OBJC_ARC_UNAVAILABLE; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'retainCount' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:39:1: note: method 'retainCount' declared here - (NSUInteger)retainCount OBJC_ARC_UNAVAILABLE; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:40:17: warning: method 'zone' in protocol 'NSObject' not implemented [-Wprotocol] @implementation LLAppDelegate ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/objc/NSObject.h:41:1: note: method 'zone' declared here - (struct _NSZone *)zone OBJC_ARC_UNAVAILABLE; ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:374:12: warning: 'NSApplication' may not respond to 'sendEvent:' [super sendEvent:event]; ~~~~~ ^ /Users/erik/Documents/Megapahit/viewer/indra/newview/llappdelegate-objc.mm:377:27: warning: 'NSWindow' may not respond to 'sendEvent:' [[self keyWindow] sendEvent:event]; ~~~~~~~~~~~~~~~~ ^
2025-05-25#4105 Fix duplicate GLTF model instances causing upload errorsAndrey Lihatskiy