From f607887b0ff2821fbeec917c8bc79ebcf1801f3e Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 3 Feb 2023 15:38:37 -0500
Subject: [PATCH] Misc tweak to avatar icon control
---
indra/newview/llavatariconctrl.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index f07a746c274..3374a1bc31f 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();
}
--
GitLab