From c551b022245c01b0813a32c43f876f4b2a0653d9 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Tue, 22 Jul 2014 13:22:38 -0500 Subject: [PATCH] Crash fix. Assumes there should only be one FSVOPartGroup, even with multiple LLVOPartGroups. --- indra/newview/llvopartgroup.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index ae668402d2..1658811349 100755 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -62,6 +62,10 @@ void LLVOPartGroup::initClass() //static void LLVOPartGroup::restoreGL() { + if (fsvopartgroup == NULL) + { + fsvopartgroup = new FSVOPartGroup(); + } // Fixing up/classifying Nicky D's fsvopartgroup code fsvopartgroup->setIndexGeneration( fsvopartgroup->getIndexGeneration() + 2); @@ -219,7 +223,10 @@ LLVOPartGroup::LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegi setNumTEs(1); setTETexture(0, LLUUID::null); mbCanSelect = FALSE; // users can't select particle systems - fsvopartgroup = new FSVOPartGroup(); + if (fsvopartgroup == NULL) + { + fsvopartgroup = new FSVOPartGroup(); + } }