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/llpanelface.cpp | |
| parent | a5cfd935d389fa6b734e625b24d9f43cf91d02ce (diff) | |
| parent | 3422f75cf749df10c7bb7711b9a7fa870655818f (diff) | |
merge renderer update fix
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 7b3bbf8b3b..7e9fe212dd 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1352,7 +1352,7 @@ void LLPanelFace::updateMaterial() mMaterial->setDiffuseAlphaMode(getChild<LLComboBox>("combobox alphamode")->getCurrentIndex()); mMaterial->setAlphaMaskCutoff((U8)(getChild<LLUICtrl>("maskcutoff")->getValue().asInteger())); llinfos << "Updating material: " << mMaterial->asLLSD() << llendl; - LLSelectMgr::getInstance()->selectionSetMaterial( *mMaterial ); + LLSelectMgr::getInstance()->selectionSetMaterial( mMaterial ); // We've sent an update. Need to hold off on any more until // the sim acknowledges this one. |