diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-07-01 10:59:46 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-07-01 10:59:46 -0500 |
| commit | d262ca32d3b80803595fcc3f61f008786125250d (patch) | |
| tree | ab7b8e13920b309321390f41c663b775f162b0c7 /indra/llprimitive | |
| parent | bd41392b7ec1dd90cd0039d87bbbef8beda1796a (diff) | |
| parent | 1c9a4fc080bee955b5b18750fe8de7c24a3f912f (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/llprimitive')
| -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; |