merge up to latest version from tonya

meow-7.2.2
Oz Linden 2013-02-01 10:21:46 -05:00
commit 4c71d5eba7
1 changed files with 2 additions and 2 deletions

View File

@ -1573,8 +1573,8 @@ void LLPanelFace::updateAlphaControls(LLUICtrl* ctrl, void* userdata)
// static
void LLPanelFace::onCommitAlphaMode(LLUICtrl* ctrl, void* userdata)
{
LLPanelFace* self = (LLPanelFace*) userdata;
self->updateAlphaControls(ctrl,userdata);
//LLPanelFace* self = (LLPanelFace*) userdata;
updateAlphaControls(ctrl,userdata);
llinfos << "updating material" << llendl;
//self->updateMaterial();
}