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
858cde02
Commit
858cde02
authored
1 year ago
by
Andrey Kleshchev
Browse files
Options
Downloads
Patches
Plain Diff
SL-19744 Small cleanup
parent
cf97837b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llcommon/llapp.cpp
+1
-7
1 addition, 7 deletions
indra/llcommon/llapp.cpp
indra/llcommon/llapp.h
+0
-1
0 additions, 1 deletion
indra/llcommon/llapp.h
with
1 addition
and
8 deletions
indra/llcommon/llapp.cpp
+
1
−
7
View file @
858cde02
...
@@ -104,7 +104,6 @@ BOOL LLApp::sLogInSignal = FALSE;
...
@@ -104,7 +104,6 @@ BOOL LLApp::sLogInSignal = FALSE;
// Keeps track of application status
// Keeps track of application status
LLScalarCond
<
LLApp
::
EAppStatus
>
LLApp
::
sStatus
{
LLApp
::
APP_STATUS_STOPPED
};
LLScalarCond
<
LLApp
::
EAppStatus
>
LLApp
::
sStatus
{
LLApp
::
APP_STATUS_STOPPED
};
LLAppErrorHandler
LLApp
::
sErrorHandler
=
NULL
;
LLAppErrorHandler
LLApp
::
sErrorHandler
=
NULL
;
BOOL
LLApp
::
sErrorThreadRunning
=
FALSE
;
LLApp
::
LLApp
()
LLApp
::
LLApp
()
...
@@ -787,13 +786,8 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
...
@@ -787,13 +786,8 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
return
;
return
;
}
}
// Flag status to ERROR
, so thread_error does its work.
// Flag status to ERROR
LLApp
::
setError
();
LLApp
::
setError
();
// Block in the signal handler until somebody says that we're done.
while
(
LLApp
::
sErrorThreadRunning
&&
!
LLApp
::
isStopped
())
{
ms_sleep
(
10
);
}
if
(
LLApp
::
sLogInSignal
)
if
(
LLApp
::
sLogInSignal
)
{
{
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llapp.h
+
0
−
1
View file @
858cde02
...
@@ -291,7 +291,6 @@ class LL_COMMON_API LLApp
...
@@ -291,7 +291,6 @@ class LL_COMMON_API LLApp
static
void
setStatus
(
EAppStatus
status
);
// Use this to change the application status.
static
void
setStatus
(
EAppStatus
status
);
// Use this to change the application status.
static
LLScalarCond
<
EAppStatus
>
sStatus
;
// Reflects current application status
static
LLScalarCond
<
EAppStatus
>
sStatus
;
// Reflects current application status
static
BOOL
sErrorThreadRunning
;
// Set while the error thread is running
static
BOOL
sDisableCrashlogger
;
// Let the OS handle crashes for us.
static
BOOL
sDisableCrashlogger
;
// Let the OS handle crashes for us.
std
::
wstring
mCrashReportPipeStr
;
//Name of pipe to use for crash reporting.
std
::
wstring
mCrashReportPipeStr
;
//Name of pipe to use for crash reporting.
...
...
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