Merge remote-tracking branch 'origin/develop' into pepper/llapputil

 # Conflicts:
 #	indra/llrender/llimagegl.cpp

Author: brad-linden

.github/workflows/build.yaml

@@ -460,14 +460,16 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          pattern: "LinuxOS-app"
+          pattern: "Linux-app"
 
       - name: Rename metadata
         run: |
           cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml
           cp Windows-metadata/newview/viewer_version.txt Windows-viewer_version.txt
           cp macOS-metadata/autobuild-package.xml macOS-autobuild-package.xml
           cp macOS-metadata/newview/viewer_version.txt macOS-viewer_version.txt
+          cp Linux-metadata/autobuild-package.xml Linux-autobuild-package.xml
+          cp Linux-metadata/newview/viewer_version.txt Linux-viewer_version.txt
 
       # forked from softprops/action-gh-release
       - name: Create GitHub release
@@ -492,6 +494,7 @@ jobs:
           files: |
             macOS-installer/*.dmg
             Windows-installer/*.exe
+            Linux-app/*.tar.xz
             *-autobuild-package.xml
             *-viewer_version.txt
 

indra/doxygen/CMakeLists.txt

@@ -1,11 +1,5 @@
 # -*- cmake -*-
 
-# cmake_minimum_required should appear before any
-# other commands to guarantee full compatibility
-# with the version specified
-## prior to 2.8, the add_custom_target commands used in setting the version did not work correctly
-cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR)
-
 set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
     "The root project/makefile/solution name. Defaults to SecondLife.")
 project(${ROOT_PROJECT_NAME})

indra/lib/python/indra/util/llmanifest.py

@@ -637,7 +637,7 @@ def unpacked_finish(self):
             'vers':'_'.join(self.args['version'])}
         print("Creating unpacked file:", unpacked_file_name)
         # could add a gz here but that doubles the time it takes to do this step
-        tf = tarfile.open(self.src_path_of(unpacked_file_name), 'w:')
+        tf = tarfile.open(self.build_path_of(unpacked_file_name), 'w:')
         # add the entire installation package, at the very top level
         tf.add(self.get_dst_prefix(), "")
         tf.close()

indra/llappearance/llavatarappearancedefines.cpp

@@ -300,7 +300,8 @@ EBakedTextureIndex LLAvatarAppearanceDictionary::findBakedByImageName(const std:
 
 LLWearableType::EType LLAvatarAppearanceDictionary::getTEWearableType(ETextureIndex index ) const
 {
-    return getTexture(index)->mWearableType;
+    auto* tex = getTexture(index);
+    return tex ? tex->mWearableType : LLWearableType::WT_INVALID;
 }
 
 // static

indra/llappearance/llwearable.cpp

@@ -653,7 +653,7 @@ void LLWearable::setVisualParamWeight(S32 param_index, F32 value)
     }
     else
     {
-        LL_ERRS() << "LLWearable::setVisualParam passed invalid parameter index: " << param_index << " for wearable type: " << this->getName() << LL_ENDL;
+        LL_WARNS() << "LLWearable::setVisualParam passed invalid parameter index: " << param_index << " for wearable type: " << this->getName() << LL_ENDL;
     }
 }
 
@@ -667,7 +667,7 @@ F32 LLWearable::getVisualParamWeight(S32 param_index) const
     }
     else
     {
-        LL_WARNS() << "LLWerable::getVisualParam passed invalid parameter index: "  << param_index << " for wearable type: " << this->getName() << LL_ENDL;
+        LL_WARNS() << "LLWearable::getVisualParam passed invalid parameter index: "  << param_index << " for wearable type: " << this->getName() << LL_ENDL;
     }
     return (F32)-1.0;
 }

indra/llcharacter/llkeyframemotion.cpp

@@ -2427,9 +2427,15 @@ void LLKeyframeMotion::onLoadComplete(const LLUUID& asset_uuid,
     LLCharacter* character = *char_iter;
 
     // look for an existing instance of this motion
-    LLKeyframeMotion* motionp = static_cast<LLKeyframeMotion*> (character->findMotion(asset_uuid));
-    if (motionp)
+    if (LLMotion* asset = character->findMotion(asset_uuid))
     {
+        LLKeyframeMotion* motionp = dynamic_cast<LLKeyframeMotion*>(asset);
+        if (!motionp)
+        {
+            // This motion is not LLKeyframeMotion (e.g., LLEmote)
+            return;
+        }
+
         if (0 == status)
         {
             if (motionp->mAssetStatus == ASSET_LOADED)

indra/llcommon/llcommon.cpp

@@ -54,7 +54,7 @@ void* ll_tracy_aligned_new(size_t size, size_t alignment)
     {
         throw std::bad_alloc();
     }
-    TracyAlloc(ptr, size);
+    LL_PROFILE_ALLOC(ptr, size);
     return ptr;
 }
 

indra/llcommon/llerror.cpp

@@ -1607,19 +1607,19 @@ namespace LLError
     std::string LLUserWarningMsg::sLocalizedOutOfMemoryWarning;
     LLUserWarningMsg::Handler LLUserWarningMsg::sHandler;
 
-    void LLUserWarningMsg::show(const std::string& message)
+    void LLUserWarningMsg::show(const std::string& message, S32 error_code)
     {
         if (sHandler)
         {
-            sHandler(std::string(), message);
+            sHandler(std::string(), message, error_code);
         }
     }
 
     void LLUserWarningMsg::showOutOfMemory()
     {
         if (sHandler && !sLocalizedOutOfMemoryTitle.empty())
         {
-            sHandler(sLocalizedOutOfMemoryTitle, sLocalizedOutOfMemoryWarning);
+            sHandler(sLocalizedOutOfMemoryTitle, sLocalizedOutOfMemoryWarning, ERROR_BAD_ALLOC);
         }
     }
 
@@ -1630,7 +1630,7 @@ namespace LLError
             "Second Life viewer couldn't access some of the files it needs and will be closed."
             "\n\nPlease reinstall viewer from  https://secondlife.com/support/downloads/ and "
             "contact https://support.secondlife.com if issue persists after reinstall.";
-        sHandler("Missing Files", error_string);
+        sHandler("Missing Files", error_string, ERROR_MISSING_FILES);
     }
 
     void LLUserWarningMsg::setHandler(const LLUserWarningMsg::Handler &handler)

indra/llcommon/llerror.h

@@ -308,15 +308,23 @@ namespace LLError
     class LLUserWarningMsg
     {
     public:
-        typedef std::function<void(const std::string&, const std::string&)> Handler;
+        typedef enum
+        {
+            ERROR_OTHER = 0,
+            ERROR_BAD_ALLOC = 1,
+            ERROR_MISSING_FILES = 2,
+        } eLastExecEvent;
+
+        // tittle, message and error code to include in error marker file
+        typedef std::function<void(const std::string&, const std::string&, S32 error_code)> Handler;
         static void setHandler(const Handler&);
         static void setOutOfMemoryStrings(const std::string& title, const std::string& message);
 
         // When viewer encounters bad alloc or can't access files try warning user about reasons
         static void showOutOfMemory();
         static void showMissingFiles();
         // Genering error
-        static void show(const std::string&);
+        static void show(const std::string&, S32 error_code = -1);
 
     private:
         // needs to be preallocated before viewer runs out of memory

indra/llcommon/llprocessor.cpp

@@ -692,7 +692,8 @@ class LLProcessorInfoDarwinImpl : public LLProcessorInfoImpl
         memset(cpu_vendor, 0, len);
         sysctlbyname("machdep.cpu.vendor", (void*)cpu_vendor, &len, NULL, 0);
         cpu_vendor[0x1f] = 0;
-        setInfo(eVendor, cpu_vendor);
+        // M series CPUs don't provide this field so if empty, just fall back to Apple.
+        setInfo(eVendor, (cpu_vendor[0] != '\0') ? cpu_vendor : "Apple");
 
         setInfo(eStepping, getSysctlInt("machdep.cpu.stepping"));
         setInfo(eModel, getSysctlInt("machdep.cpu.model"));