diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-04 13:15:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-04 13:15:43 -0500 |
| commit | a373a7442c244712ab17d793072699ef82684816 (patch) | |
| tree | 2ed20e24993c4bfbb4f943ed7794fcd06eeb8a23 /indra/llprimitive/lltextureentry.cpp | |
| parent | b0c255f4e6141246f3575cb3d5b671af19966de9 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-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; |