diff options
author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-10 20:17:43 +0300 |
---|---|---|
committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-10 20:17:43 +0300 |
commit | 8a0b7eaaddf9170db5f205d94f680915da13239c (patch) | |
tree | 7b2028fa1bbb4fa64adcc4a1298952465cd87539 /indra/newview/llviewerpartsim.cpp | |
parent | d995782edf1a55c327ad3f3349bd9d4b6ec3d9e6 (diff) | |
parent | e2019e8a3b5175eb6d7322fbe7c466f213854640 (diff) |
Merge for MAINT-3117
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); |