diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 21:15:54 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 21:15:54 +0300 |
| commit | f4c7c8aff55d0cd8f044d5b7c8cddb2be750dde5 (patch) | |
| tree | 8c02c1a468a85367c3b7e43e4e95ffb5f1dca452 /indra/newview/llpanelface.cpp | |
| parent | 231dea378babc0ee9806f0fcd68283e79f81d2eb (diff) | |
Post-merge build fixes
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 810c18de40..13d0e377d7 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -2953,7 +2953,7 @@ void LLPanelFace::onCopyFaces() if (id.isNull() || (!full_perm && item_id.isNull())) { - if (!LLLocalBitmapMgr::getInstance()->isLocalBitmap(id)) + if (!LLLocalBitmapMgr::getInstance()->isLocal(id)) { te_data["te"].erase("imageid"); te_data["te"]["imageid"] = LLUUID(gSavedSettings.getString("DefaultObjectTexture")); |