Skip to content
Snippets Groups Projects
Commit 7de1de62 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix crash from LLPointer falling out of scope

parent f1aab92d
Branches coverity
No related tags found
No related merge requests found
......@@ -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 itMaterial->second;
return material_ptr;
}
void LLMaterialMgr::setMaterialCallbacks(const LLMaterialID& material_id, const LLMaterialPtr material_ptr)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment