diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/llviewerpartsim.h | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llviewerpartsim.h')
| -rw-r--r-- | indra/newview/llviewerpartsim.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h index daccac4e8f..de763d3e53 100644 --- a/indra/newview/llviewerpartsim.h +++ b/indra/newview/llviewerpartsim.h @@ -52,9 +52,9 @@ typedef void (*LLVPCallback)(LLViewerPart &part, const F32 dt); // -class LLViewerPart : public LLPartData, public LLRefCount +class LLViewerPart : public LLPartData { -protected: +public: ~LLViewerPart(); public: LLViewerPart(); @@ -100,7 +100,7 @@ public: void shift(const LLVector3 &offset); - typedef std::vector<LLPointer<LLViewerPart> > part_list_t; + typedef std::vector<LLViewerPart*> part_list_t; part_list_t mParticles; const LLVector3 &getCenterAgent() const { return mCenterAgent; } |