diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-15 16:26:05 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-15 16:26:05 -0700 |
| commit | c46b24fc9abb00528249b5a1482ace8d31d835c2 (patch) | |
| tree | 2b6b56f1496049bea67df36c693892398322475e /indra/newview/llselectmgr.cpp | |
| parent | 5dea7c6b8f6bc0d7306c52b8c9d642f2a7f5dfc5 (diff) | |
| parent | 387732090b7464763f6b5788a50545db243ac4be (diff) | |
Merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rwxr-xr-x | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 7c9c935a1b..e42d29f7e3 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2059,7 +2059,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; } @@ -5865,7 +5865,7 @@ void LLSelectNode::saveTextureScaleRatios(LLRender::eTexIndex index_to_query) { case LLRender::DIFFUSE_MAP: { - tep->getScale(&s,&t); + tep->getScale(&s,&t); } break; |