diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
| commit | d3e954cfaca067adf60f2e3c161028c6549263e4 (patch) | |
| tree | 54826d4b8ff8fa7683770876bb654c3afdaaf076 /indra/llprimitive/lltextureentry.cpp | |
| parent | 79836e32d575248642cfd6af837548aac054988f (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge 3.6.6 Materials RC and update Intel HD gpu_table entries to expect GL 4.2 to nag resis to get the fixed Intel driver
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; |