diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-04-01 17:03:59 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-04-01 17:03:59 -0700 |
commit | b1ae22c3eb71767219ebb96ec80011e10bbfabbe (patch) | |
tree | 41eb0fd5eb7f4986f99ce2a0d11273c32f33e7d1 /indra/newview/llpanelpeoplemenus.cpp | |
parent | f17cfd952a274cc6c684e50db004d62373a49d1f (diff) | |
parent | 9bdbc10aba78d7c6fec832ee4c411b483f05c441 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelpeoplemenus.cpp')
-rw-r--r-- | indra/newview/llpanelpeoplemenus.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp index 8b365c6433..862e32cca8 100644 --- a/indra/newview/llpanelpeoplemenus.cpp +++ b/indra/newview/llpanelpeoplemenus.cpp @@ -226,6 +226,11 @@ bool NearbyMenu::enableContextMenuItem(const LLSD& userdata) return (LLAvatarTracker::instance().isBuddyOnline(id) && is_agent_mappable(id)) || gAgent.isGodlike(); } + else if(item == std::string("can_offer_teleport")) + { + const LLUUID& id = mUUIDs.front(); + return LLAvatarActions::canOfferTeleport(id); + } return false; } |