diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-01-30 13:48:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-01-30 13:48:37 +0800 |
| commit | 45eeed33872a9ff367bc6f2997c2fdedb65171ac (patch) | |
| tree | ba58689aeea923bdb674b2183b0f9f1b328dcc9a /indra/newview/llviewermenu.cpp | |
| parent | dbe9c9c1929cfb345f9363e4ba1cb4128188d2f3 (diff) | |
| parent | 3caf20f4c43173393c10b9cecbb266a4f7ff3702 (diff) | |
Merge tag 'Second_Life_Release#3caf20f4-2026.01' into 2026.01
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 489e40c593..24f2cf20e0 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6729,11 +6729,8 @@ class LLAvatarEnableResetSkeleton : public view_listener_t { bool handleEvent(const LLSD& userdata) { - if (LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject())) - { - return true; - } - return false; + LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(); + return obj && obj->getAvatar(); } }; |