diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
| commit | b877665551343dc94ca02c84622b06518f9c23d8 (patch) | |
| tree | 9ad6a76d0363b56ccb249f105d6ee72207df8864 /indra/newview/llvopartgroup.cpp | |
| parent | f732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff) | |
| parent | 6e018f7143537af7bd9a08f1cc5c87ea4c8382c8 (diff) | |
merge
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 |