summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-03-16 16:11:37 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-03-16 18:11:44 +0200
commit3e9a13dc07ae0eeb5f5f0fc06dde660f9f851283 (patch)
treeda8720a23bca826d4b5a8dd8286e91b25c1a9476 /indra/newview/llviewerobject.cpp
parentc58c308d2163db1040acabe5a85c3853ef4edb44 (diff)
SL-17008 Viewer spams 'mSourceObject is NULL' warning
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index eba079a8d8..f61a251dcf 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -342,6 +342,13 @@ LLViewerObject::~LLViewerObject()
mPartSourcep = NULL;
}
+ if (mText)
+ {
+ // something recovered LLHUDText when object was already dead
+ mText->markDead();
+ mText = NULL;
+ }
+
// Delete memory associated with extra parameters.
std::map<U16, ExtraParameter*>::iterator iter;
for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)