diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:22:47 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:22:47 -0600 |
| commit | 801301c435414df1e22c321a685044b7cd43055e (patch) | |
| tree | a037964ae80d938cabd8ad1e656cab0946e7488f /indra/newview/llface.cpp | |
| parent | 361a2277733a0afaf61f6c6150f1933d2e5aceb7 (diff) | |
fix DEV-41913: parcel media does not display on particle textures.
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 09b3ce1e86..0276cd9a24 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -278,6 +278,16 @@ void LLFace::setTexture(LLViewerTexture* tex) } mTexture = tex ; + + //check if this texture is replaced by a parcel media texture. + if(mTexture.notNull() && mTexture->hasParcelMedia()) + { + LLViewerMediaTexture* mediap = LLViewerTextureManager::findMediaTexture(mTexture->getID()) ; + if(mediap) + { + mediap->addMediaToFace(this) ; + } + } } void LLFace::dirtyTexture() |