summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-09-10 19:08:34 -0400
committerGitHub <noreply@github.com>2025-09-10 19:08:34 -0400
commit3ab18e8545810483685f3d2cd4f091f178d772bb (patch)
tree32e76fafa82099080f443506cb45aa1546f355e1 /indra/newview
parent5b97823db6f7cec6569ef893499cf48f4a889e67 (diff)
parentf98a61be70fe7c73d446213bb143edc4035ddef7 (diff)
Merge pull request #4657 from secondlife/brad/mac_universal
Improvements found in reviewing mac_arm branch #4629
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9eb0d3fade..2dabf3355a 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5660,6 +5660,8 @@ void LLAppViewer::forceErrorBreakpoint()
#else
#if defined(LL_X86) || defined(LL_X86_64)
asm ("int $3");
+#else
+ __builtin_trap();
#endif
#endif
return;