From 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 12 Aug 2008 17:29:50 +0000 Subject: QAR-767 Combined maint-render-7 and maint-viewer-9 merge merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated --- indra/newview/llviewerpartsim.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llviewerpartsim.h') 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 > part_list_t; + typedef std::vector part_list_t; part_list_t mParticles; const LLVector3 &getCenterAgent() const { return mCenterAgent; } -- cgit v1.2.3