summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerpartsource.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewerpartsource.h')
-rw-r--r--indra/newview/llviewerpartsource.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerpartsource.h b/indra/newview/llviewerpartsource.h
index 4bd577b7a5..30ea00809a 100644
--- a/indra/newview/llviewerpartsource.h
+++ b/indra/newview/llviewerpartsource.h
@@ -87,8 +87,8 @@ public:
BOOL updateFromMesg();
// Returns a new particle source to attach to an object...
- static LLViewerPartSourceScript *unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, const S32 block_num);
- static LLViewerPartSourceScript *unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, LLDataPacker &dp);
+ static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, const S32 block_num);
+ static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, LLDataPacker &dp);
LLViewerImage *getImage() const { return mImagep; }
void setImage(LLViewerImage *imagep);
@@ -137,7 +137,6 @@ class LLViewerPartSourceBeam : public LLViewerPartSource
{
public:
LLViewerPartSourceBeam();
- ~LLViewerPartSourceBeam();
/*virtual*/ void setDead();
@@ -155,6 +154,7 @@ public:
LLVector3d mLKGTargetPosGlobal;
LLColor4 mColor;
protected:
+ ~LLViewerPartSourceBeam();
};