diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-09-19 13:45:39 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-09-19 13:45:39 -0700 |
| commit | 5b197db0c46b142f977670e3ca6aea9687622e78 (patch) | |
| tree | acbb40dfeb731d1f8b3f9d8656bd2ee28384b22c /indra/llprimitive/lltextureentry.cpp | |
| parent | 094a226fd8027405dd220dbc25951a3b70c9fa67 (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Pull from lindenlab/viewer-release
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
| -rwxr-xr-x | indra/llprimitive/lltextureentry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 597f078490..0db75a0e82 100755 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -545,7 +545,7 @@ S32 LLTextureEntry::setMaterialID(const LLMaterialID& pMaterialID) { mMaterialUpdatePending = true; mMaterialID = pMaterialID; - return TEM_CHANGE_NONE; + return TEM_CHANGE_TEXTURE; } mMaterialUpdatePending = false; |