diff options
| author | Kitty Barnett <develop@catznip.com> | 2013-05-12 16:10:31 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2013-05-12 16:10:31 +0200 |
| commit | 5ac9d9cb05f22099bea8c9312f5e0b234430022a (patch) | |
| tree | dbbc463c82b74e5003fd430308d56f0abad8361f /indra/llprimitive | |
| parent | c2c9380fe135fd8b191ebe3c9a38129af4994ed8 (diff) | |
LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::null
Diffstat (limited to 'indra/llprimitive')
| -rwxr-xr-x | indra/llprimitive/lltextureentry.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 8365c9d7b6..597f078490 100755 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -550,12 +550,9 @@ S32 LLTextureEntry::setMaterialID(const LLMaterialID& pMaterialID) mMaterialUpdatePending = false; mMaterialID = pMaterialID; + return TEM_CHANGE_TEXTURE; } - if (mMaterialID.isNull()) - { - setMaterialParams(NULL); - } - return TEM_CHANGE_TEXTURE; + return TEM_CHANGE_NONE; } S32 LLTextureEntry::setMaterialParams(const LLMaterialPtr pMaterialParams) |