diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-02 17:16:03 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-02 17:16:03 +0200 |
| commit | 28c0bcf7e608db5bd5c3811906be03f1457dd45d (patch) | |
| tree | 5ac94e9dd3d46ee2db797dd43acfcc098427bf5b /indra/newview/llvopartgroup.cpp | |
| parent | d3d53c9e41f6de250e7bd059d4120b9be08d31da (diff) | |
| parent | d8b3e7a021b97bf3cb4494c4d9228ed0a3c16738 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvopartgroup.cpp')
| -rw-r--r-- | indra/newview/llvopartgroup.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index 7585842623..143cd2d9c6 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -249,6 +249,12 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable) facep->mCenterLocal = part->mPosAgent; facep->setFaceColor(part->mColor); facep->setTexture(part->mImagep); + + //check if this particle texture is replaced by a parcel media texture. + if(part->mImagep.notNull() && part->mImagep->hasParcelMedia()) + { + part->mImagep->getParcelMedia()->addMediaToFace(facep) ; + } mPixelArea = tot_area * pixel_meter_ratio; const F32 area_scale = 10.f; // scale area to increase priority a bit |