diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-26 11:55:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-26 11:55:03 -0500 |
| commit | bb66e722d3ebf62145784227178ccdd318189cf6 (patch) | |
| tree | cc28868865089c9a377e4db16f29e09893ed83e8 /indra/llprimitive | |
| parent | 280a9d9827e4e5e0e1408cc8f9c20ef792a6c714 (diff) | |
| parent | b717a28194eb6e5a2f9113c65abe62cb81141413 (diff) | |
Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366
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; |