diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-16 11:04:12 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-16 11:04:12 -0400 |
commit | 099e3b41668a8c951cf74ec585ed4192bab507db (patch) | |
tree | 5481b7cbb15e5674d552fb063227c1277bcdb78b /indra/newview/llviewerpartsim.h | |
parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) | |
parent | d2c3c2f9fe197b1856e9a8ed37aeb56b77e2ff07 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerpartsim.h')
-rw-r--r-- | indra/newview/llviewerpartsim.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h index 40e8e1d45d..ab1cd715ab 100644 --- a/indra/newview/llviewerpartsim.h +++ b/indra/newview/llviewerpartsim.h @@ -135,9 +135,8 @@ protected: class LLViewerPartSim : public LLSingleton<LLViewerPartSim> { + LLSINGLETON(LLViewerPartSim); public: - LLViewerPartSim(); - virtual ~LLViewerPartSim(){} void destroyClass(); typedef std::vector<LLViewerPartGroup *> group_list_t; |