diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-12-12 11:57:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-12 11:57:07 -0800 |
| commit | 24bb1e58f87bbc42ec006d1eb107091c709b6de3 (patch) | |
| tree | 99031882ec6fd39473d8b67f5cb06f8d38d8be2f /indra/newview/llviewerobject.cpp | |
| parent | 43341b7aa9c883066c6d31da929cc30732da66f9 (diff) | |
| parent | f4eec813a3043e2277ae62da6a829c65887d0785 (diff) | |
Merge branch 'develop' into rider/privileged_land
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 1675c44c5c..06089e48b8 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -7469,9 +7469,10 @@ const std::string& LLViewerObject::getAttachmentItemName() const LLVOAvatar* LLViewerObject::getAvatar() const { LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR; - if (getControlAvatar()) + LLControlAvatar* ca = getControlAvatar(); + if (ca) { - return getControlAvatar(); + return ca; } if (isAttachment()) { |