diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-11-12 15:47:04 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-11-12 15:47:04 +0000 |
| commit | 6e76e20faaa71caa10fdea8148735bd11141ebe1 (patch) | |
| tree | c174e7cc65e82e3efd7d119e5644162187369c04 /indra/newview/llhudtext.cpp | |
| parent | f9a09406b38ad62e1db5914a96e462002c80fce9 (diff) | |
| parent | 21e2f3e974cfe8e337a7dae7dc26e68fb3c2c4ba (diff) | |
Merged in DV510-merge-6.4.12 (pull request #372)
DRTVWR-510 merge in 6.4.12
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(); } |