diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-09-09 14:23:24 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-09-09 14:23:24 +0800 |
commit | 693137a6487e6ffda9ff15ade62d0e8bfec1bf49 (patch) | |
tree | 12c078a35bebfd139d108f5fb7cd6c7fc4455c70 /indra/newview/llpanelpeoplemenus.cpp | |
parent | b9ab04cd6e253848bad865fc1b5ea993a2a060f3 (diff) | |
parent | 8a9a3dc9d760db37bb963d3e5bfadafdd94ee08d (diff) |
Merge branch '2025.06'
Diffstat (limited to 'indra/newview/llpanelpeoplemenus.cpp')
-rw-r--r-- | indra/newview/llpanelpeoplemenus.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp index 04b8af49c1..794ae4ad44 100644 --- a/indra/newview/llpanelpeoplemenus.cpp +++ b/indra/newview/llpanelpeoplemenus.cpp @@ -155,11 +155,15 @@ void PeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags) bool PeopleContextMenu::enableContextMenuItem(const LLSD& userdata) { + std::string item = userdata.asString(); if(gAgent.getID() == mUUIDs.front()) { + if (item == std::string("can_zoom_in")) + { + return true; + } return false; } - std::string item = userdata.asString(); // Note: can_block and can_delete is used only for one person selected menu // so we don't need to go over all uuids. @@ -351,7 +355,10 @@ void PeopleContextMenu::eject() avatar = (LLVOAvatar*) object; } } - if (!avatar) return; + + if (!avatar) + return; + LLSD payload; payload["avatar_id"] = avatar->getID(); std::string fullname = avatar->getFullname(); |