summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-25 12:39:46 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-25 12:39:46 -0700
commit9aad318fb9b9480a87d87db902dd2f064d9348af (patch)
tree2ee6663288dd21f03444a435addbb1925dd389e6 /indra/newview/llpanelface.cpp
parent18a476daceccd337e990eec367cac5b985c8836f (diff)
parent62cd50fe1edd67308cf0a2e5407bd4005e705681 (diff)
Merged from viewer-release
Diffstat (limited to 'indra/newview/llpanelface.cpp')
-rw-r--r--indra/newview/llpanelface.cpp1
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);
}