From 21ff0bb5ed508b6f07f1d1bea53979ed54f0721e Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 23 Apr 2022 06:44:25 -0400
Subject: [PATCH] Small cleanup
---
indra/newview/llsculptidsize.cpp | 7 +++----
indra/newview/llvovolume.cpp | 10 ++++++----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/indra/newview/llsculptidsize.cpp b/indra/newview/llsculptidsize.cpp
index 9edd78bff03..96dc279b7b5 100644
--- a/indra/newview/llsculptidsize.cpp
+++ b/indra/newview/llsculptidsize.cpp
@@ -50,10 +50,9 @@ void LLSculptIDSize::inc(const LLDrawable *pdrawable, int sz)
if (!pdrawable) return;
LLVOVolume* vvol = pdrawable->getVOVolume();
- if (!vvol) return;
- if (!vvol->isAttachment()) return;
- if (!vvol->getAvatar()) return;
- if (vvol->getAvatar()->isSelf()) return;
+ if (!vvol || !vvol->isAttachment()) return;
+ LLVOAvatar* vavatar = vvol->getAvatar();
+ if (!vavatar || vavatar->isSelf()) return;
LLVolume *vol = vvol->getVolume();
if (!vol) return;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 1563fe630de..0dec80c1504 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1191,13 +1191,15 @@ void LLVOVolume::notifyMeshLoaded()
mSculptChanged = TRUE;
gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY, TRUE);
- if (getAvatar() && !isAnimatedObject())
+ LLVOAvatar* rigged_avatar = getAvatar();
+ if (rigged_avatar && !isAnimatedObject())
{
- getAvatar()->addAttachmentOverridesForObject(this);
+ rigged_avatar->addAttachmentOverridesForObject(this);
}
- if (getControlAvatar() && isAnimatedObject())
+ LLControlAvatar* control_avatar = getControlAvatar();
+ if (control_avatar && isAnimatedObject())
{
- getControlAvatar()->addAttachmentOverridesForObject(this);
+ control_avatar->addAttachmentOverridesForObject(this);
}
updateVisualComplexity();
}
--
GitLab