diff options
author | Richard Linden <none@none> | 2010-06-24 15:00:03 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-06-24 15:00:03 -0700 |
commit | 63b3bf29208d51df84f10594266661d6294df4c6 (patch) | |
tree | f07fd0aa162283ffd8914c7cfdc7a8cd7b201759 /indra/newview/llpanelface.cpp | |
parent | a77b0827c2189101de44801e003588881a75a79b (diff) | |
parent | e7040fad36bd03407f5c51e9cac809ce8b98c900 (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); } |