diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-06-25 08:55:46 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-06-25 08:55:46 -0400 |
| commit | 7aa6fd235d96fc1394b98eb48ad94471b6d5b4c9 (patch) | |
| tree | 9e00a401da8db6457051da2612423b1eeedd061a /indra/newview/llpanelface.cpp | |
| parent | 23706afa6431e34f821baa925ada220b06833a97 (diff) | |
| parent | c77efc92e3ebcb9af9bb997e5b709484153844d4 (diff) | |
Merge from q/viewer-release
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); } |