diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-26 16:32:38 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-26 16:32:38 +0200 |
| commit | 35b5b5e2a3dceaf98fdf770d971c45b1c80116ed (patch) | |
| tree | 3f34f5deff668a9a0001f79560b3823dd48d6f49 /indra/newview/llpanelpeoplemenus.cpp | |
| parent | e962b8418f8a37c1d18743c31199dd9c33d5c74b (diff) | |
| parent | 379517ce5e1535b20a94ef3a581e1b25223f8798 (diff) | |
merge
--HG--
branch : product-engine
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 854651cd01..313ed4b70e 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; } |