diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:34:52 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:34:52 -0600 |
| commit | 4e1cde2e39cec8bca60faa65045a2055dd41efbf (patch) | |
| tree | 1eb86813fdc2c90646254ac670f70e5ddd019b34 /indra/newview/llface.cpp | |
| parent | a857fe1d82c82dfbebbcf1102f0f5ad06a396d60 (diff) | |
| parent | 01d06db0154e0cfc43c82664c6bf6129a3fa4883 (diff) | |
merge
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() |