diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-20 15:57:19 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-20 15:57:19 -0400 |
| commit | 271c06363cd8c077d110da6501392cf33a45017b (patch) | |
| tree | 887a16544cdb6a7de4b0f1651d148c849b81d5be /indra/newview | |
| parent | 4bd450737bf1f5a74a4857932235d7bcbead1388 (diff) | |
| parent | 2d5b917cea8e1ca7c06fcc47d82a4ea25d3c4494 (diff) | |
Automated merge with ssh://nyx@hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index ddb5f49ab0..ec685405ed 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -896,7 +896,7 @@ void LLPanelEditWearable::onTexturePickerCommit(const LLUICtrl* ctrl) { // Set the new version LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(texture_ctrl->getImageAssetID()); - if( image->getID().isNull() ) + if( image->getID() == IMG_DEFAULT ) { image = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT_AVATAR); } |