diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-08-30 15:55:59 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-08-30 15:55:59 -0500 |
| commit | 4bd87bb45f1c6aa2251c01311befa0975d596c3f (patch) | |
| tree | cb0569424285644ac2ce5d91a8e84c1b356655ff /indra/newview/llviewerpartsim.cpp | |
| parent | ef7826a930071f1829fe81d12da75b048159acc7 (diff) | |
| parent | cacefaf2fc1b95557aca62dc69dbe3744c6424b0 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
| -rwxr-xr-x | indra/newview/llviewerpartsim.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 96cd43a8ab..163c90019f 100755 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -160,7 +160,11 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 ¢er_agent, const F32 bo } mVOPartGroupp->setViewerPartGroup(this); mVOPartGroupp->setPositionAgent(getCenterAgent()); + + mBoxSide = box_side; + F32 scale = box_side * 0.5f; + mVOPartGroupp->setScale(LLVector3(scale,scale,scale)); //gPipeline.addObject(mVOPartGroupp); |