Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
JennaHuntsman
XDG Integration
Commits
7de1de62
Commit
7de1de62
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix crash from LLPointer falling out of scope
parent
f1aab92d
Branches
coverity
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llmaterialmgr.cpp
+4
-2
4 additions, 2 deletions
indra/newview/llmaterialmgr.cpp
with
4 additions
and
2 deletions
indra/newview/llmaterialmgr.cpp
+
4
−
2
View file @
7de1de62
...
...
@@ -394,11 +394,13 @@ const LLMaterialPtr LLMaterialMgr::setMaterial(const LLUUID& region_id, const LL
itMaterial
=
ret
.
first
;
}
setMaterialCallbacks
(
material_id
,
itMaterial
->
second
);
LLMaterialPtr
material_ptr
=
itMaterial
->
second
;
setMaterialCallbacks
(
material_id
,
material_ptr
);
mGetPending
.
erase
(
pending_material_t
(
region_id
,
material_id
));
return
itM
aterial
->
second
;
return
m
aterial
_ptr
;
}
void
LLMaterialMgr
::
setMaterialCallbacks
(
const
LLMaterialID
&
material_id
,
const
LLMaterialPtr
material_ptr
)
...
...
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