From dcf115beb64312c616909f50141003a376039125 Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 12 Sep 2024 16:34:16 +0100 Subject: [PATCH 1/2] FIRE-34496 - BugSplat Crash: renderAvatars (when imposter rendering) Fix for mAvatar not initialised when single_avatar is null. Also added additional null checks in the avatar rendering process to prevent potential null dereference issues. --- indra/newview/lldrawpoolavatar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index f286a04ae1..fd34be11bc 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -693,7 +693,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) // Add avatar hitbox debug static LLCachedControl render_hitbox(gSavedSettings, "DebugRenderHitboxes", false); - if (render_hitbox && pass == 2 && mAvatar && !mAvatar->isControlAvatar()) + if (render_hitbox && pass == 2 && (single_avatar || mAvatar) && !mAvatar->isControlAvatar()) { LL_PROFILE_ZONE_NAMED_CATEGORY_AVATAR("render_hitbox"); @@ -784,14 +784,14 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) { LL_PROFILE_ZONE_NAMED_CATEGORY_AVATAR("Find avatarp"); // Tracy markup const LLFace *facep = mDrawFace[0]; - if (!facep->getDrawable()) + if (!facep || !facep->getDrawable()) // trap possible null dereference { return; } avatarp = (LLVOAvatar *)facep->getDrawable()->getVObj().get(); } - if (avatarp->isDead() || avatarp->mDrawable.isNull()) + if (!avatarp || avatarp->isDead() || avatarp->mDrawable.isNull()) // trap possible null dereference { return; } From 2824d2d23b1b5d951a5d400499080e7a66f92c2a Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 12 Sep 2024 22:48:40 +0200 Subject: [PATCH 2/2] FIRE-34486 Italian Translation Update, by Spartaco Zemenis --- indra/newview/skins/default/xui/it/notifications.xml | 3 +++ .../newview/skins/default/xui/it/panel_preferences_sound.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 00393a5f19..37e51b5e76 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -5296,6 +5296,9 @@ Se vuoi vedere questo oggetto, toglilo e indossalo su un punto di attacco dell'a Il caricamento è attualmente in corso. Riprova più tardi. + + Le scene GLTF non sono ancora supportate dalla tua scheda grafica. + Stai per abilitare AutoFPS. Tutte le impostazioni grafiche non salvate andranno perse. diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml index 97e670c895..0d55bd44a9 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml @@ -124,10 +124,10 @@ - + - + Soppressione del rumore: