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/newview/llselectmgr.cpp | |
| parent | c2c9380fe135fd8b191ebe3c9a38129af4994ed8 (diff) | |
LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::null
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rwxr-xr-x | indra/newview/llselectmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 3f60b5f642..e80ad6976e 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2052,7 +2052,7 @@ void LLSelectMgr::selectionRemoveMaterial() { LL_DEBUGS("Materials") << "Removing material from object " << object->getID() << " face " << face << LL_ENDL; LLMaterialMgr::getInstance()->remove(object->getID(),face); - object->setTEMaterialID(face,LLMaterialID::null); + object->setTEMaterialParams(face, NULL); } return true; } |