diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
| commit | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (patch) | |
| tree | d4991e4c1a9dd934f48d33804e55eb8ffa085679 /indra/newview/llface.cpp | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | f20e9521a9b70f4e83cbb6888feae08a70681ea7 (diff) | |
merge from latest svn/viewer-2-0 to hg/viewer-2-0
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index b0ae13348b..4246cbc27f 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -280,6 +280,11 @@ void LLFace::setTexture(LLViewerTexture* tex) mTexture = tex ; } +void LLFace::dirtyTexture() +{ + gPipeline.markTextured(getDrawable()); +} + void LLFace::switchTexture(LLViewerTexture* new_texture) { if(mTexture == new_texture) @@ -295,7 +300,7 @@ void LLFace::switchTexture(LLViewerTexture* new_texture) getViewerObject()->changeTEImage(mTEOffset, new_texture) ; setTexture(new_texture) ; - gPipeline.markTextured(getDrawable()); + dirtyTexture(); } void LLFace::setTEOffset(const S32 te_offset) |