diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-24 18:01:32 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-24 18:01:32 -0400 |
| commit | 84f1f65af045746cfa73c7efd68ce960ac47cdf2 (patch) | |
| tree | d04acf2262c9298ba64149c0eb5ec3342a95c4ad /indra/newview/llpanelface.cpp | |
| parent | 632860484556e156bbe021a4f2d3411899837216 (diff) | |
| parent | 63b3bf29208d51df84f10594266661d6294df4c6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index b50c6442e1..7d5be39074 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -790,7 +790,6 @@ void LLPanelFace::getState() if(texture_ctrl) { texture_ctrl->setImageAssetID( LLUUID::null ); - texture_ctrl->setFallbackImageName( "locked_image.j2c" ); texture_ctrl->setEnabled( FALSE ); // this is a LLUICtrl, but we don't want it to have keyboard focus so we add it as a child, not a ctrl. // texture_ctrl->setValid(FALSE); } |