diff options
author | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
commit | 089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch) | |
tree | 0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/newview/llviewerpartsource.h | |
parent | Second Life viewer sources 1.16.0.5 (diff) | |
download | meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2 meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz |
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/newview/llviewerpartsource.h')
-rw-r--r-- | linden/indra/newview/llviewerpartsource.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerpartsource.h b/linden/indra/newview/llviewerpartsource.h index 3fd6b85..9d22e72 100644 --- a/linden/indra/newview/llviewerpartsource.h +++ b/linden/indra/newview/llviewerpartsource.h | |||
@@ -107,8 +107,8 @@ public: | |||
107 | BOOL updateFromMesg(); | 107 | BOOL updateFromMesg(); |
108 | 108 | ||
109 | // Returns a new particle source to attach to an object... | 109 | // Returns a new particle source to attach to an object... |
110 | static LLViewerPartSourceScript *unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, const S32 block_num); | 110 | static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, const S32 block_num); |
111 | static LLViewerPartSourceScript *unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, LLDataPacker &dp); | 111 | static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, LLDataPacker &dp); |
112 | 112 | ||
113 | LLViewerImage *getImage() const { return mImagep; } | 113 | LLViewerImage *getImage() const { return mImagep; } |
114 | void setImage(LLViewerImage *imagep); | 114 | void setImage(LLViewerImage *imagep); |
@@ -157,7 +157,6 @@ class LLViewerPartSourceBeam : public LLViewerPartSource | |||
157 | { | 157 | { |
158 | public: | 158 | public: |
159 | LLViewerPartSourceBeam(); | 159 | LLViewerPartSourceBeam(); |
160 | ~LLViewerPartSourceBeam(); | ||
161 | 160 | ||
162 | /*virtual*/ void setDead(); | 161 | /*virtual*/ void setDead(); |
163 | 162 | ||
@@ -175,6 +174,7 @@ public: | |||
175 | LLVector3d mLKGTargetPosGlobal; | 174 | LLVector3d mLKGTargetPosGlobal; |
176 | LLColor4 mColor; | 175 | LLColor4 mColor; |
177 | protected: | 176 | protected: |
177 | ~LLViewerPartSourceBeam(); | ||
178 | }; | 178 | }; |
179 | 179 | ||
180 | 180 | ||