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
f24335d7
Commit
f24335d7
authored
14 years ago
by
Andrew A. de Laix
Browse files
Options
Downloads
Patches
Plain Diff
Fix log file inclusion; include SecondLife.log on crash, but SecondLife.old on freeze.
parent
592ee60a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llcrashlogger/llcrashlogger.cpp
+10
-6
10 additions, 6 deletions
indra/llcrashlogger/llcrashlogger.cpp
with
10 additions
and
6 deletions
indra/llcrashlogger/llcrashlogger.cpp
+
10
−
6
View file @
f24335d7
...
@@ -190,12 +190,16 @@ void LLCrashLogger::gatherFiles()
...
@@ -190,12 +190,16 @@ void LLCrashLogger::gatherFiles()
mFileMap
[
"SettingsXml"
]
=
gDirUtilp
->
getExpandedFilename
(
LL_PATH_USER_SETTINGS
,
"settings.xml"
);
mFileMap
[
"SettingsXml"
]
=
gDirUtilp
->
getExpandedFilename
(
LL_PATH_USER_SETTINGS
,
"settings.xml"
);
}
}
// Replace the log file ext with .old, since the
if
(
mCrashInPreviousExec
)
// instance that launched this process has overwritten
{
// SecondLife.log
// Restarting after freeze.
std
::
string
log_filename
=
mFileMap
[
"SecondLifeLog"
];
// Replace the log file ext with .old, since the
log_filename
.
replace
(
log_filename
.
size
()
-
4
,
4
,
".old"
);
// instance that launched this process has overwritten
mFileMap
[
"SecondLifeLog"
]
=
log_filename
;
// SecondLife.log
std
::
string
log_filename
=
mFileMap
[
"SecondLifeLog"
];
log_filename
.
replace
(
log_filename
.
size
()
-
4
,
4
,
".old"
);
mFileMap
[
"SecondLifeLog"
]
=
log_filename
;
}
gatherPlatformSpecificFiles
();
gatherPlatformSpecificFiles
();
...
...
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