diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-13 13:02:53 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-13 13:02:53 -0700 |
commit | d9e8ee7cfd323872145c23e4032989f9b7770f55 (patch) | |
tree | a58b01e3fe80c1f60875026e664626fd3eeb5559 /indra/llprimitive | |
parent | 5ac9d9cb05f22099bea8c9312f5e0b234430022a (diff) |
NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consistent and increased max range on repeats per meter
Diffstat (limited to 'indra/llprimitive')
-rwxr-xr-x | indra/llprimitive/lltextureentry.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 597f078490..ca57f1edbd 100755 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -539,28 +539,21 @@ S32 LLTextureEntry::setGlow(F32 glow) S32 LLTextureEntry::setMaterialID(const LLMaterialID& pMaterialID) { - if ( (mMaterialID != pMaterialID) || (mMaterialUpdatePending && !mSelected) ) + if (mMaterialID != pMaterialID) { - if (mSelected) + mMaterialID = pMaterialID; + + } + if (mMaterialID.isNull()) { - mMaterialUpdatePending = true; - mMaterialID = pMaterialID; - return TEM_CHANGE_NONE; + setMaterialParams(NULL); } - - mMaterialUpdatePending = false; - mMaterialID = pMaterialID; return TEM_CHANGE_TEXTURE; } - return TEM_CHANGE_NONE; -} S32 LLTextureEntry::setMaterialParams(const LLMaterialPtr pMaterialParams) { - if (mSelected) - { - mMaterialUpdatePending = true; - } + mMaterial = pMaterialParams; return TEM_CHANGE_TEXTURE; } |