aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerpartsim.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerpartsim.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index 8c06381..914eb2d 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -103,7 +103,7 @@ LLViewerPart &LLViewerPart::operator=(const LLViewerPart &part)
103 return *this; 103 return *this;
104} 104}
105 105
106void LLViewerPart::init(LLViewerPartSource *sourcep, LLViewerImage *imagep, LLVPCallback cb) 106void LLViewerPart::init(LLPointer<LLViewerPartSource> sourcep, LLViewerImage *imagep, LLVPCallback cb)
107{ 107{
108 LLMemType mt(LLMemType::MTYPE_PARTICLES); 108 LLMemType mt(LLMemType::MTYPE_PARTICLES);
109 mPartID = LLViewerPart::sNextPartID; 109 mPartID = LLViewerPart::sNextPartID;
@@ -521,6 +521,7 @@ LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part)
521 llwarns << "LLViewerPartSim::put - Particle didn't go into its box!" << llendl; 521 llwarns << "LLViewerPartSim::put - Particle didn't go into its box!" << llendl;
522 llinfos << groupp->getCenterAgent() << llendl; 522 llinfos << groupp->getCenterAgent() << llendl;
523 llinfos << part->mPosAgent << llendl; 523 llinfos << part->mPosAgent << llendl;
524 delete groupp;
524 return NULL; 525 return NULL;
525 } 526 }
526 return groupp; 527 return groupp;
@@ -672,7 +673,7 @@ void LLViewerPartSim::updateSimulation()
672} 673}
673 674
674 675
675void LLViewerPartSim::addPartSource(LLViewerPartSource *sourcep) 676void LLViewerPartSim::addPartSource(LLPointer<LLViewerPartSource> sourcep)
676{ 677{
677 LLMemType mt(LLMemType::MTYPE_PARTICLES); 678 LLMemType mt(LLMemType::MTYPE_PARTICLES);
678 if (!sourcep) 679 if (!sourcep)
@@ -693,6 +694,7 @@ void LLViewerPartSim::cleanupRegion(LLViewerRegion *regionp)
693 694
694 if ((*iter)->getRegion() == regionp) 695 if ((*iter)->getRegion() == regionp)
695 { 696 {
697 delete *iter;
696 i = mViewerPartGroups.erase(iter); 698 i = mViewerPartGroups.erase(iter);
697 } 699 }
698 } 700 }