Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
ae11dfe1
Commit
ae11dfe1
authored
3 years ago
by
Mnikolenko ProductEngine
Browse files
Options
Downloads
Patches
Plain Diff
build fix
parent
3623e6eb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llcommon/llapp.cpp
+4
-4
4 additions, 4 deletions
indra/llcommon/llapp.cpp
indra/newview/llappviewermacosx.cpp
+2
-2
2 additions, 2 deletions
indra/newview/llappviewermacosx.cpp
with
6 additions
and
6 deletions
indra/llcommon/llapp.cpp
+
4
−
4
View file @
ae11dfe1
...
@@ -388,7 +388,7 @@ void LLApp::setupErrorHandling(bool second_instance)
...
@@ -388,7 +388,7 @@ void LLApp::setupErrorHandling(bool second_instance)
#if defined(LL_BUGSPLAT)
#if defined(LL_BUGSPLAT)
// Don't install our own signal handlers -- BugSplat needs to hook them,
// Don't install our own signal handlers -- BugSplat needs to hook them,
// or it's completely ineffectual.
// or it's completely ineffectual.
bool
installHandler
=
false
;
//
bool installHandler = false;
#else // ! LL_BUGSPLAT
#else // ! LL_BUGSPLAT
//
//
...
@@ -400,7 +400,7 @@ void LLApp::setupErrorHandling(bool second_instance)
...
@@ -400,7 +400,7 @@ void LLApp::setupErrorHandling(bool second_instance)
setup_signals
();
setup_signals
();
// Add google breakpad exception handler configured for Darwin/Linux.
// Add google breakpad exception handler configured for Darwin/Linux.
bool
installHandler
=
true
;
//
bool installHandler = true;
#endif // ! LL_BUGSPLAT
#endif // ! LL_BUGSPLAT
#if LL_DARWIN
#if LL_DARWIN
...
@@ -427,13 +427,13 @@ void LLApp::setupErrorHandling(bool second_instance)
...
@@ -427,13 +427,13 @@ void LLApp::setupErrorHandling(bool second_instance)
{
{
// P_TRACED flag is set, so this process is being debugged; do not install
// P_TRACED flag is set, so this process is being debugged; do not install
// the handler
// the handler
if
(
info
.
kp_proc
.
p_flag
&
P_TRACED
)
installHandler
=
false
;
//
if(info.kp_proc.p_flag & P_TRACED) installHandler = false;
}
}
else
else
{
{
// Failed to discover if the process is being debugged; default to
// Failed to discover if the process is being debugged; default to
// installing the handler.
// installing the handler.
installHandler
=
true
;
//
installHandler = true;
}
}
#endif // ! LL_RELEASE_FOR_DOWNLOAD
#endif // ! LL_RELEASE_FOR_DOWNLOAD
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llappviewermacosx.cpp
+
2
−
2
View file @
ae11dfe1
...
@@ -243,11 +243,11 @@ bool LLAppViewerMacOSX::init()
...
@@ -243,11 +243,11 @@ bool LLAppViewerMacOSX::init()
bool
success
=
LLAppViewer
::
init
();
bool
success
=
LLAppViewer
::
init
();
#if LL_SEND_CRASH_REPORTS
#if LL_SEND_CRASH_REPORTS
if
(
success
)
/*
if (success)
{
{
LLAppViewer* pApp = LLAppViewer::instance();
LLAppViewer* pApp = LLAppViewer::instance();
pApp->initCrashReporting();
pApp->initCrashReporting();
}
}
*/
#endif
#endif
return
success
;
return
success
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment