diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-01 10:21:46 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-01 10:21:46 -0500 |
| commit | 4c71d5eba72a13c2aebb7a7305d2fb8e03f14e84 (patch) | |
| tree | 558904d9a16aeb75f9d3175f0832fc7f2c18bda0 /indra | |
| parent | 90bf22ef24fbb8ff3497dd271abc7f7555a4f758 (diff) | |
| parent | 132db13fb6bb6dd802d3ee000a10e91127403547 (diff) | |
merge up to latest version from tonya
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 4f61d5bbb6..474fa9d58e 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -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(); } |