diff --git a/indra/newview/installers/darwin/apple-notarize.sh b/indra/newview/installers/darwin/apple-notarize.sh
index c8ff10df5c..edaeb95896 100755
--- a/indra/newview/installers/darwin/apple-notarize.sh
+++ b/indra/newview/installers/darwin/apple-notarize.sh
@@ -28,11 +28,35 @@ if [[ -f "$CONFIG_FILE" ]]; then
             echo "Notarized with id: [$match]"
         else
             echo "No match found"
+            exit 1
         fi
 
-        # if [[ ! $match -eq 0 ]]; then
-        echo "Running Stapler"
-        xcrun stapler staple "$app_file"
+        # --- WAIT / RETRY LOGIC FOR STAPLER ---
+        # Try stapler up to 5 times with a 5-second delay in between attempts
+        max_attempts=5
+        sleep_seconds=5
+        attempt=1
+
+        while [[ $attempt -le $max_attempts ]]; do
+            echo "Running stapler (attempt $attempt of $max_attempts)..."
+            xcrun stapler staple "$app_file"
+            ret=$?
+
+            if [[ $ret -eq 0 ]]; then
+                echo "Stapling succeeded on attempt $attempt"
+                break
+            else
+                if [[ $attempt -lt $max_attempts ]]; then
+                    echo "Stapling failed (Error $ret). Waiting $sleep_seconds seconds before retry..."
+                    sleep $sleep_seconds
+                else
+                    echo "Stapling failed after $max_attempts attempts, giving up."
+                    exit 65
+                fi
+            fi
+            attempt=$((attempt + 1))
+        done
+
         # Delete the zip file to stop it being packed in the dmg
         rm -f "$zip_file"
         if [[ $? -eq 0 ]]; then
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index ddd3893bc4..fa1f800952 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -129,16 +129,12 @@ void LLHUDText::render()
         // If the current text object is highighed and the use hover highlight feature is enabled, then 
         // disable writing to the depth buffer
         static LLCachedControl<bool> mbUseHoverHighlight(gSavedSettings, "FSHudTextUseHoverHighlight");
-        if (mbUseHoverHighlight && mbIsHighlighted)
-        {            
-            LLGLDepthTest gls_depth(GL_FALSE, GL_FALSE);
-        }
-        //Else, use the standard method of writing to the depth buffer for all other non-highlighted text objects
-        else
-        {
-            LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-        }
-        // </FS:minerjr> [FIRE-35019]		
+        // <FS:minerjr> [FIRE-35102] - Hover text appearing through walls in Beta 7.1.12.7737
+        // So it turns out when the LLGLDepthTest object goes out of scope, it reverts back
+        // to the previous state. So by having the LLGLDepthTest in the if statements, they were
+        // never applied.
+        LLGLDepthTest gls_depth(mbUseHoverHighlight && mbIsHighlighted ? GL_FALSE : GL_TRUE, GL_FALSE);
+        // </FS:minerjr> [FIRE-35019] </FS:minerjr> [FIRE-35102]	
         //LLGLDisable gls_stencil(GL_STENCIL_TEST);
         renderText();
     }