diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-11-03 15:50:04 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-11-03 15:50:04 -0700 |
| commit | eaa1ce61b084f23746934e0a7b899242045d691b (patch) | |
| tree | bf74fcb4e0b6ccf5da5479b28315648348f00326 /indra/newview/llvopartgroup.cpp | |
| parent | 5d64b6f15510aa74cc8e8bd31c1d16a4eec76746 (diff) | |
| parent | 99d9712dd7f2a11a1094cba380f92e677710b56b (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 |