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
2a6f919c
Commit
2a6f919c
authored
13 years ago
by
Nat Goodspeed
Browse files
Options
Downloads
Patches
Plain Diff
Explicitly clean up all LLLeap instances during viewer shutdown.
This code replaces the previous cleanup of DLLs loaded by APR.
parent
7de3161f
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/newview/llappviewer.cpp
+19
-0
19 additions, 0 deletions
indra/newview/llappviewer.cpp
with
19 additions
and
0 deletions
indra/newview/llappviewer.cpp
+
19
−
0
View file @
2a6f919c
...
...
@@ -1544,6 +1544,25 @@ bool LLAppViewer::cleanup()
gDirUtilp
->
deleteFilesInDir
(
logdir
,
"*-*-*-*-*.dmp"
);
}
{
// Kill off LLLeap objects. We can find them all because LLLeap is derived
// from LLInstanceTracker. But collect instances first: LLInstanceTracker
// specifically forbids adding/deleting instances while iterating.
std
::
vector
<
LLLeap
*>
leaps
;
leaps
.
reserve
(
LLLeap
::
instanceCount
());
for
(
LLLeap
::
instance_iter
li
(
LLLeap
::
beginInstances
()),
lend
(
LLLeap
::
endInstances
());
li
!=
lend
;
++
li
)
{
leaps
.
push_back
(
&*
li
);
}
// Okay, now trash them all. We don't have to NULL or erase the entry
// in 'leaps' because the whole vector is going away momentarily.
BOOST_FOREACH
(
LLLeap
*
leap
,
leaps
)
{
delete
leap
;
}
}
// destroy 'leaps'
//flag all elements as needing to be destroyed immediately
// to ensure shutdown order
LLMortician
::
setZealous
(
TRUE
);
...
...
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