diff options
| author | Callum Prentice <callum@gmail.com> | 2020-11-11 13:22:35 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-11-11 13:22:35 -0800 |
| commit | 9b1d9150c23ac378623e6222c742753d6dc39070 (patch) | |
| tree | 7b28475acf539006c3d674decd36cfeb72aba992 /indra/newview/llhudtext.cpp | |
| parent | 727b89e94cc5125c62b0eaebe304ba613f38225a (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-519
Diffstat (limited to 'indra/newview/llhudtext.cpp')
| -rw-r--r-- | indra/newview/llhudtext.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index 82824861a9..72d28a3d44 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -565,7 +565,10 @@ S32 LLHUDText::getMaxLines() void LLHUDText::markDead() { - sTextObjects.erase(LLPointer<LLHUDText>(this)); + // make sure we have at least one pointer + // till the end of the function + LLPointer<LLHUDText> ptr(this); + sTextObjects.erase(ptr); LLHUDObject::markDead(); } |