summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-09-23 11:36:50 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-09-23 11:36:50 -0400
commit8bcff54654f9ec98d166dabd38180be63dc8837c (patch)
tree65d1744531195f7ec3bd8eee000928dcd8ca62a9 /indra/newview/llviewerobject.cpp
parent4af7cd51e9cc22d9dc2fe42e378051c55515ac8e (diff)
parentdb013ab0cb7dafb964b149a36b6963770f7427e5 (diff)
Merge remote branch 'develop'into release/luau-scripting
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index e36a03a749..86440fca48 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -7280,6 +7280,7 @@ const std::string& LLViewerObject::getAttachmentItemName() const
//virtual
LLVOAvatar* LLViewerObject::getAvatar() const
{
+ LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
if (getControlAvatar())
{
return getControlAvatar();