From abdc99f21b542c4fea67030ddbd7166c9d1c6c63 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 18 Feb 2009 21:10:16 +0000
Subject: Merge of QAR-1267 to trunk.  This was a combo merge of QAR-1175
 (maint-render-9) and QAR-1236 (dll-msvcrt-2)

svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
---
 indra/newview/llviewerpartsim.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewerpartsim.cpp')

diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index d513c021ee..b74f9e9f2c 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -152,7 +152,9 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 &center_agent, const F32 bo
 	mVOPartGroupp->setPositionAgent(getCenterAgent());
 	F32 scale = box_side * 0.5f;
 	mVOPartGroupp->setScale(LLVector3(scale,scale,scale));
-	gPipeline.addObject(mVOPartGroupp);
+	
+	//gPipeline.addObject(mVOPartGroupp);
+	gPipeline.createObject(mVOPartGroupp);
 
 	LLSpatialGroup* group = mVOPartGroupp->mDrawable->getSpatialGroup();
 
-- 
cgit v1.2.3