From 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Wed, 30 May 2007 17:39:09 +0000 Subject: merge -r61423:62602 svn/branches/maintenance --> release --- indra/newview/llviewerobject.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 279dfe2923..e15f5da537 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -208,6 +208,12 @@ LLViewerObject::~LLViewerObject() mJointInfo = NULL; } + if (mPartSourcep) + { + mPartSourcep->setDead(); + mPartSourcep = NULL; + } + // Delete memory associated with extra parameters. std::map::iterator iter; for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter) -- cgit v1.2.3