diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:10:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:10:11 -0500 |
| commit | 66c75202a8a99adeb7de443ce5ebe3d834f91c24 (patch) | |
| tree | 1afcc988ef2e0b9c2d424e62201fb73f0c877f76 /indra/newview/llselectmgr.cpp | |
| parent | a5cfd935d389fa6b734e625b24d9f43cf91d02ce (diff) | |
| parent | 3422f75cf749df10c7bb7711b9a7fa870655818f (diff) | |
merge renderer update fix
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index c93cecdd5d..9f343f465c 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2010,18 +2010,19 @@ void LLSelectMgr::selectionSetGlow(F32 glow) mSelectedObjects->applyToObjects( &func2 ); } -void LLSelectMgr::selectionSetMaterial(LLMaterial& material) +void LLSelectMgr::selectionSetMaterial(LLMaterialPtr material) { struct f1 : public LLSelectedTEFunctor { - LLMaterial mMaterial; - f1(LLMaterial material) : mMaterial(material) {}; + LLMaterialPtr mMaterial; + f1(LLMaterialPtr material) : mMaterial(material) {}; bool apply(LLViewerObject* object, S32 face) { if (object->permModify()) { - llinfos << "Putting material on object " << object->getID() << " face " << face << ", material: " << mMaterial.asLLSD() << llendl; - LLMaterialMgr::getInstance()->put(object->getID(),face,mMaterial); + llinfos << "Putting material on object " << object->getID() << " face " << face << ", material: " << mMaterial->asLLSD() << llendl; + LLMaterialMgr::getInstance()->put(object->getID(),face,*mMaterial); + object->setTEMaterialParams(face,mMaterial); } return true; } |