merge release@83343 skinning-1-merge@83714 -> release

QAR-424

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h
index 343425f3d4..daccac4e8f 100644
--- a/indra/newview/llviewerpartsim.h
+++ b/indra/newview/llviewerpartsim.h
@@ -35,12 +35,11 @@
 #include "lldarrayptr.h"
 #include "llframetimer.h"
 #include "llmemory.h"
-
 #include "llpartdata.h"
+#include "llviewerpartsource.h"
 
 class LLViewerImage;
 class LLViewerPart;
-class LLViewerPartSource;
 class LLViewerRegion;
 class LLViewerImage;
 class LLVOPartGroup;
@@ -126,11 +125,12 @@ protected:
 	LLViewerRegion *mRegionp;
 };
 
-class LLViewerPartSim
+class LLViewerPartSim : public LLSingleton<LLViewerPartSim>
 {
 public:
 	LLViewerPartSim();
-	virtual ~LLViewerPartSim();
+	virtual ~LLViewerPartSim(){}
+	void destroyClass();
 
 	typedef std::vector<LLViewerPartGroup *> group_list_t;
 	typedef std::vector<LLPointer<LLViewerPartSource> > source_list_t;