diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index f07a746c274c12f6707fc895c445d1ea46795abc..3374a1bc31f89e3a3e3847eb392ede7393fc8cf9 100644 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp @@ -278,7 +278,8 @@ bool LLAvatarIconCtrl::updateFromCache() const LLUUID& icon_id = *icon_id_ptr; // Update the avatar - if (icon_id.notNull()) + static LLCachedControl<bool> UseDefaultImage(gSavedSettings, "AlchemyUseDefaultAvatarIcon", false); + if (icon_id.notNull() && !UseDefaultImage) { LLIconCtrl::setValue(icon_id); } @@ -304,6 +305,10 @@ void LLAvatarIconCtrl::processProperties(void* data, EAvatarProcessorType type) return; } +// [SL:KB] - Patch: Control-AvatarIconCtrl | Checked: 2014-02-20 (Catznip-3.7) + LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId, this); +// [/SL:KB] + LLAvatarIconIDCache::getInstance()->add(mAvatarId,avatar_data->image_id); updateFromCache(); }