From e61a10ec5b6b84fcb5c27e8e308022d0094f8736 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 4 Jun 2007 18:46:59 +0000
Subject: svn merge -r 62602:62831
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/llviewerpartsim.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llviewerpartsim.h')

diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h
index b0b9500ac6..afde3049f7 100644
--- a/indra/newview/llviewerpartsim.h
+++ b/indra/newview/llviewerpartsim.h
@@ -33,12 +33,13 @@ typedef void (*LLVPCallback)(LLViewerPart &part, const F32 dt);
 
 class LLViewerPart : public LLPartData, public LLRefCount
 {
+protected:
+	~LLViewerPart();
 public:
 	LLViewerPart();
-	~LLViewerPart();
 
 	LLViewerPart &operator=(const LLViewerPart &part);
-	void init(LLViewerPartSource *sourcep, LLViewerImage *imagep, LLVPCallback cb);
+	void init(LLPointer<LLViewerPartSource> sourcep, LLViewerImage *imagep, LLVPCallback cb);
 
 
 	U32					mPartID;					// Particle ID used primarily for moving between groups
@@ -113,7 +114,7 @@ public:
 
 	void updateSimulation();
 
-	void addPartSource(LLViewerPartSource *sourcep);
+	void addPartSource(LLPointer<LLViewerPartSource> sourcep);
 
 	void cleanupRegion(LLViewerRegion *regionp);
 
-- 
cgit v1.2.3